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

Merge branch 'develop' into feat/#80-start-update-promotion

parents 851e0c6b 004359e7

.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,

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/pages/+orders/+order/order-products/order-products.component.html

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 


			<h4 class="text-danger" *ngIf="order?.isCancelled">

				{{

					'ORDER_VIEW.ORDER_PRODUCT_INFO.THE_ORDER_IS_CANCEL'

					'ORDER_VIEW.ORDER_PRODUCT_INFO.THE_ORDER_IS_CANCELED'

						| translate

				}}

			</h4>

packages/admin-web-angular/src/assets/i18n/bg-BG.json

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
			"ADD_PRODUCTS": "Добавете продукти",

			"REMOVE_PRODUCTS": "Премахване на продуктите",

			"CANCEL_ORDER": "Отмяна на поръчката",

			"THE_ORDER_IS_CANCEL": "Поръчката е отменена",

			"THE_ORDER_IS_CANCELED": "Поръчката е отменена",

			"THE_ORDER_IS_GIVEN_TO_CARRIER": "Поръчката се дава на превозвача.",

			"THE_ORDER_IS_DELIVERED": "Поръчката е доставена.",

			"ADD_PRODUCTS_MODAL": "Добавяне на продукти",