Merge branch 'develop' of https://github.com/ever-co/ever into develop (2d7062ed) · Commits · Isfand Yar Khan / ever-demand

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		"name": "@ever-platform/core",
		"description": "Ever Platform Headless Framework",
		"license": "AGPL-3.0",
		"version": "0.3.12",
		"version": "0.3.13",
		"homepage": "https://ever.co",
		"repository": {
		"type": "git",

+22 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,28 @@ export function getStoreOrdersFingObj(storeId: string, status: string) {
		findObj['warehouseStatus'] = OrderWarehouseStatus.NoStatus;
		findObj['isCancelled'] = false;
		break;
		case 'alocation_started':
		findObj['warehouseStatus'] = OrderWarehouseStatus.AllocationStarted;
		findObj['isCancelled'] = false;
		break;
		case 'ready_for_packaging':
		findObj['warehouseStatus'] =
		OrderWarehouseStatus.AllocationFinished;
		findObj['isCancelled'] = false;
		break;
		case 'processing':
		findObj['warehouseStatus'] =
		OrderWarehouseStatus.WarehouseStartedProcessing;
		findObj['isCancelled'] = false;
		break;
		case 'packaging':
		findObj['warehouseStatus'] = OrderWarehouseStatus.PackagingStarted;
		findObj['isCancelled'] = false;
		break;
		case 'packaged':
		findObj['warehouseStatus'] = OrderWarehouseStatus.PackagingFinished;
		findObj['isCancelled'] = false;
		break;
		case 'not_paid':
		findObj['isPaid'] = false;
		break;

+3 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,7 @@
		"ALL": "Всички",
		"LOADING_MORE_DATA": "Още данни се зареждат ...",
		"ORDERS": "Поръчки",
		"SWITCH_ORDERS": "Филтрирай Поръчките",
		"NEW_ORDER": "Нова поръчка",
		"PRODUCTS": "Топ Продукти",
		"SELECT_POP_UP": {
		@@ -269,6 +270,8 @@
		"CANCEL": "ОТКАЗ"
		},
		"ORDER_WAREHOUSE_STATUSES": {
		"ALL": "Всички",
		"CANCELLED": "Отменени",
		"CREATED": "Създаден",
		"CONFIRMED": "Потвърдено",
		"PROCESSING": "Обработване",

+3 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,7 @@
		"ALL": "Всички",
		"LOADING_MORE_DATA": "Още данни се зареждат ...",
		"ORDERS": "Поръчки",
		"SWITCH_ORDERS": "Филтрирай Поръчките",
		"NEW_ORDER": "Нова поръчка",
		"PRODUCTS": "Топ Продукти",
		"SELECT_POP_UP": {
		@@ -269,6 +270,8 @@
		"CANCEL": "ОТКАЗ"
		},
		"ORDER_WAREHOUSE_STATUSES": {
		"ALL": "Всички",
		"CANCELLED": "Отменени",
		"CREATED": "Създаден",
		"CONFIRMED": "Потвърдено",
		"PROCESSING": "Обработване",