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

Merge branch 'develop' into l10n_develop

parents 824bc3e1 3245caa9

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
npm-debug.log

yarn-debug.log

yarn-error.log

yarn.lock

testem.log

/typings

.vscode/settings.json

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

	"git.confirmSync": false,

	"explorer.confirmDelete": false,

	"editor.formatOnSave": true,

	"editor.tabSize": 4,

	"editor.insertSpaces": false,

	"editor.detectIndentation": false,

package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "ever-platform",

	"description": "Ever Platform",

	"license": "AGPL-3.0",

	"version": "0.3.0",

	"version": "0.3.1",

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

	"repository": {

		"type": "git",

packages/admin-web-angular/src/app/@shared/render-component/store-product-is-available-checkbox/is-available-checkbox.component.ts

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ export class IsAvailableCheckBox implements ViewCell, OnInit { 
		this.isChecked = this.rowData.isProductAvailable;

		this.wareHouseId = this.rowData.storeId;

		this.productId = this.rowData.product.id;

		console.warn(this.rowData);

	}



	async clickHandler() {

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

+1 −6
Original line number Diff line number Diff line
@@ -85,12 +85,7 @@ export class WarehouseManageTabsComponent { 
	}



	get validForm() {

		return (

			this.form.valid &&

			this.contactInfoForm.validForm &&

			this.paymentsSettingsForm.isPaymentValid &&

			this.paymentsSettingsForm.isCashPaymentEnabled

		);

		return this.form.valid && this.paymentsSettingsForm.isPaymentValid;

	}



	get deliveryAreas() {