senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added orders to confirm report / phone allows more digits now / added reports to rails admin navigation

Browse Source
This commit is contained in:
Senad Uka
2015-05-11 11:35:24 +02:00
parent 0490800ab3
commit fe452d359f
11 changed files with 661 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
front-ui/app/components/cart/checkoutPage.js
View File

@@ -469,9 +469,9 @@ var CheckoutPage = React.createClass({
<option value="76258">Srnice</option>
<option value="79224">Bosanska Kostajnica</option>
<option value="74450">Bosanski Brod</option>
<option value="73110">Srpsko Gorazde</option>
<option value="76278">Srpsko Orasje</option>
<option value="71123">Srpsko Sarajevo</option>
<option value="73110">Istocno Gorazde</option>
<option value="76278">Istocno Orasje</option>
<option value="71123">Istocno Sarajevo</option>
<option value="74208">Stanari</option>
<option value="78243">Stara Dubrava</option>
<option value="79268">Stari Majdan</option>
@@ -578,8 +578,8 @@ var CheckoutPage = React.createClass({
<div className="col-md-4">
<RibicaFormError componentName="phone" errorMessagesObject={this.state.deliveryDestinationErrors} />
<div className="input-group">
<span className="input-group-addon">06</span>
<input id="phone" name="phone" className="form-control" placeholder="1 222 333" type="text" required="" value={this.state.deliveryDestination.get('phone')} onChange={this._onFieldChange} />
<span className="input-group-addon">+387 </span>
<input id="phone" name="phone" className="form-control" placeholder="061 222 333" type="text" required="" value={this.state.deliveryDestination.get('phone')} onChange={this._onFieldChange} />
</div>
<p className="help-block">broj mobitela - mora biti sa jedne od mreža u BiH</p>
</div>

4
front-ui/app/stores/cartStore.js
View File

@@ -156,7 +156,7 @@ var validateDeliveryDestinationForm = function() {
_deliveryDestinationErrors['email'] = "Email mora biti ispravno upisan";
}
var phoneRegex = /[\d\s-]{7,8}/i;
var phoneRegex = /[\d\s-]{8,12}/i;
if (Validation.safeString(_deliveryDestination.get('phone')).search(phoneRegex) < 0) {
_deliveryDestinationErrors['phone'] = "Telefon mora biti ispravan";
}
@@ -261,7 +261,7 @@ AppDispatcher.register(function(payload) {
takeItemOut(action.itemId);
break;
case CartConstants.CART_DATA_LOADED:
// do nothing - jsut emmit change
// do nothing - just emmit change
break;
case CartConstants.SAVE_CART_STATE_FOR_ITEM:
if (isDeliveryDestinationValid()) {