Unverified Commit d42f5f38 authored by Ruslan Konviser's avatar Ruslan Konviser Committed by GitHub
Browse files

Merge branch 'develop' into feat/#49-Admin-orders-short-process

parents f016e088 e8604853

packages/admin-web-angular/package.json

+1 −1
Original line number Diff line number Diff line 
{

	"name": "@ever-platform/admin-web-angular",

	"version": "0.3.0",

	"version": "0.3.1",

	"description": "Ever Admin",

	"license": "AGPL-3.0",

	"homepage": "https://ever.co",

packages/admin-web-angular/src/app/@shared/warehouse/forms/payments-settings/payments-settings-form.component.html

+9 −1
Original line number Diff line number Diff line 
<div class="col-sm-12">

	<div class="row m-0">

		<div class="form-group offset-md-2 col-md-8">

		<div class="form-group offset-md-2 col-md-4">

			<nb-checkbox [(ngModel)]="isPaymentEnabled">

				{{

					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.ALLOW_ONLINE_PAYMENT'
@@ -8,6 +8,14 @@ 
				}}

			</nb-checkbox>

		</div>

		<div class="form-group offset-md-2 col-md-4">

			<nb-checkbox [(ngModel)]="isCashPaymentEnabled">

				{{

					'FAKE_DATA.SETUP_MERCHANTS.PAYMENTS.ALLOW_CASH_PAYMENT'

						| translate

				}}

			</nb-checkbox>

		</div>

	</div>

	<div [hidden]="!isPaymentEnabled" class="row m-0">

		<div class="form-group offset-md-2 col-md-8">

packages/admin-web-angular/src/app/@shared/warehouse/forms/payments-settings/payments-settings-form.component.ts

+6 −0
Original line number Diff line number Diff line
@@ -19,17 +19,23 @@ export class PaymentsSettingsFormComponent { 
	isEdit: boolean;



	isPaymentEnabled: boolean = false;

	isCashPaymentEnabled: boolean = true;



	get isPaymentValid() {

		return !this.isPaymentEnabled || this.paymentGateways.isValid;

	}



	get isCashPaymentValid() {

		return !this.isCashPaymentEnabled || this.paymentGateways.isValid;

	}



	get paymentsGateways(): IPaymentGatewayCreateObject[] {

		return this.paymentGateways.paymentsGateways;

	}



	setValue(merchant: Warehouse) {

		this.isPaymentEnabled = merchant.isPaymentEnabled;

		this.isCashPaymentEnabled = merchant.isCashPaymentEnabled;

		this.paymentGateways.setValue(merchant);

	}

}

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.html

+40 −14
Original line number Diff line number Diff line
@@ -14,7 +14,10 @@ 
					[hidden]="isEditing"

					class="form-group row mb-4 centered"

				>

					<span>Select shape to add a new zone</span>

					<span>{{

						'WAREHOUSE_VIEW.MUTATION.SELECT_SHAPE_TO_ADD_ZONE'

							| translate

					}}</span>

					<div class="col-sm-12 btn-container">

						<button

							(click)="
@@ -22,7 +25,7 @@ 
							"

							nbButton

						>

							Circle

							{{ 'WAREHOUSE_VIEW.MUTATION.CIRCLE' | translate }}

						</button>

						<button

							(click)="
@@ -30,7 +33,7 @@ 
							"

							nbButton

						>

							Shape

							{{ 'WAREHOUSE_VIEW.MUTATION.SHAPE' | translate }}

						</button>

					</div>

				</div>
@@ -39,21 +42,28 @@ 
					class="mb-4"

					*ngIf="!shapeReady && selectedShapeType"

					[hidden]="isEditing"

					>Draw a shape on the map</span

					>{{

						'WAREHOUSE_VIEW.MUTATION.DRAW_SHAPE_ON_MAP' | translate

					}}</span

				>



				<fieldset *ngIf="shapeReady || isEditing">

					<div class="form-group row">

						<label

							class="col-sm-4 d-flex align-items-center control-label"

							>Name</label

							>{{

								'WAREHOUSE_VIEW.MUTATION.NAME' | translate

							}}</label

						>



						<div class="col-sm-8">

							<input

								type="text"

								class="form-control"

								placeholder="Zone name"

								[placeholder]="

									'WAREHOUSE_VIEW.MUTATION.ZONE_NAME'

										| translate

								"

								formControlName="name"

							/>

						</div>
@@ -62,7 +72,10 @@ 
					<div class="form-group row">

						<label

							class="col-sm-4 d-flex align-items-center control-label"

							>Minimum amount</label

							>{{

								'WAREHOUSE_VIEW.MUTATION.MINIMUM_AMOUNT'

									| translate

							}}</label

						>



						<div class="col-sm-8">
@@ -70,7 +83,10 @@ 
								type="number"

								step="0.1"

								class="form-control"

								placeholder="Minimum amount"

								[placeholder]="

									'WAREHOUSE_VIEW.MUTATION.MINIMUM_AMOUNT'

										| translate

								"

								formControlName="amount"

							/>

						</div>
@@ -79,7 +95,10 @@ 
					<div class="form-group row">

						<label

							class="col-sm-4 d-flex align-items-center control-label"

							>Delivery fee</label

							>{{

								'WAREHOUSE_VIEW.MUTATION.DELIVERY_FEE'

									| translate

							}}</label

						>



						<div class="col-sm-8">
@@ -87,7 +106,10 @@ 
								type="number"

								step="0.1"

								class="form-control"

								placeholder="Delvery fee"

								[placeholder]="

									'WAREHOUSE_VIEW.MUTATION.DELIVERY_FEE'

										| translate

								"

								formControlName="fee"

							/>

						</div>
@@ -100,7 +122,9 @@ 
								nbButton

								class="btn btn-wa rning"

							>

								Cancel

								{{

									'WAREHOUSE_VIEW.MUTATION.CANCEL' | translate

								}}

							</button>



							<button
@@ -112,7 +136,7 @@ 
								class="btn btn-primary"

								(click)="addZone()"

							>

								Add

								{{ 'WAREHOUSE_VIEW.MUTATION.ADD' | translate }}

							</button>

						</div>
@@ -125,7 +149,9 @@ 
								nbButton

								class="btn btn-warning"

							>

								Cancel

								{{

									'WAREHOUSE_VIEW.MUTATION.CANCEL' | translate

								}}

							</button>

							<button

								[disabled]="deliverForm.status === 'INVALID'"
@@ -133,7 +159,7 @@ 
								class="btn btn-primary"

								(click)="editZone()"

							>

								Edit

								{{ 'WAREHOUSE_VIEW.MUTATION.EDIT' | translate }}

							</button>

						</div>

					</div>

packages/admin-web-angular/src/app/@shared/warehouse/forms/warehouse-manage-tabs/delivery-areas/warehouse-manage-tabs-delivery-areas.component.ts

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ export class WarehouseManageTabsDeliveryAreasComponent 
	// Used to know when we're editing a zone

	isEditing: boolean = false;



	private _zoneNumber;

	private _zoneNumber = 0;



	private _map: google.maps.Map;

	private _drawingManager: google.maps.drawing.DrawingManager;