Unverified Commit 5ad11a6b authored by YavorGrancharov's avatar YavorGrancharov Committed by GitHub
Browse files

Feat/#30 show orders by status (#1210) 

* feat: show orders by status

* feat: show orders by status

* feat: show orders by status

* feat: filter order status dropdown options

* feat: filter order status dropdown options

* feat: styled switch orders dropdown

* fix: removed not needed option selected attribute
parent 0054b051

.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/core/package.json

+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",

packages/core/src/services/warehouses/WarehousesOrdersService.ts

+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;

packages/merchant-tablet-ionic/src/assets/i18n/bg-BG.json

+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": "Обработване",

packages/merchant-tablet-ionic/src/assets/i18n/bg.json

+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": "Обработване",