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

Merge branch 'develop' into fix/#1148-admin-delivery-zones

parents 48d6ce50 ad2d18a5

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/warehouse-manage-tabs.component.ts

+5 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ export class WarehouseManageTabsComponent { 
		return (

			this.form.valid &&

			this.contactInfoForm.validForm &&

			this.paymentsSettingsForm.isPaymentValid

			this.paymentsSettingsForm.isPaymentValid &&

			this.paymentsSettingsForm.isCashPaymentEnabled

		);

	}
@@ -133,6 +134,7 @@ export class WarehouseManageTabsComponent { 
			deliveryAreas: any; // add type

			isPaymentEnabled: boolean;

			paymentsGateways: object[];

			isCashPaymentEnabled: boolean;

		} = {

			basicInfo: { ...detailsRaw, username: accountRaw.username },

			password: accountRaw.password,
@@ -141,8 +143,9 @@ export class WarehouseManageTabsComponent { 
			deliveryAreas: deliveryAreasRaw,

			isPaymentEnabled: this.paymentsSettingsForm.isPaymentEnabled,

			paymentsGateways: this.paymentsSettingsForm.paymentsGateways,

			isCashPaymentEnabled: this.paymentsSettingsForm

				.isCashPaymentEnabled,

		};



		return inputResult;

	}

packages/admin-web-angular/src/app/@shared/warehouse/warehouse-mutation/warehouse-mutation.component.ts

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ export class WarehouseMutationComponent implements AfterViewInit { 
					isPaymentEnabled: this.paymentsSettingsForm

						.isPaymentEnabled,

					paymentGateways: this.paymentsSettingsForm.paymentsGateways,

					isCashPaymentEnabled: this.paymentsSettingsForm

						.isCashPaymentEnabled,

				},

				password: this.basicInfoForm.getPassword(),

			});