From fb3a28e74edcc1eefa5cf87c2d15bd1b0fc82f0f Mon Sep 17 00:00:00 2001 From: miroman-afk <74014189+miroman-afk@users.noreply.github.com> Date: Thu, 27 Jan 2022 13:29:12 +0300 Subject: [PATCH] v.2.9 -Fix modifiers in orders --- commands/POSTRestoreShift.php | 2 +- composer.json | 2 +- ...01_26_210748_create_action_types_table.php | 34 ++++++ database/seeders/AddActionTypes.php | 67 +++++++++++ models/ActionTypes.php | 15 +++ module.ini | 4 +- web/views/orders/edit.html | 42 +++---- web/views/orders/selectmenuitem — old.html | 104 ++++++++++++++++++ web/views/orders/selectmenuitem.html | 55 +++------ 9 files changed, 260 insertions(+), 65 deletions(-) create mode 100644 database/migrations/2022_01_26_210748_create_action_types_table.php create mode 100644 database/seeders/AddActionTypes.php create mode 100644 models/ActionTypes.php create mode 100644 web/views/orders/selectmenuitem — old.html diff --git a/commands/POSTRestoreShift.php b/commands/POSTRestoreShift.php index 7992229..b778eff 100644 --- a/commands/POSTRestoreShift.php +++ b/commands/POSTRestoreShift.php @@ -129,7 +129,7 @@ class POSTRestoreShift extends HRCCommand implements HRCCommandInterface { $shift_online_item->count_return = $exchange_item["count_return"]; $shift_online_item->dish_code = $exchange_item["dishes_code"]; $shift_online_item->menu_code = $exchange_item["menu_code"]; - if ($exchange_item["modificator_code"] > 0) { + if ($exchange_item["menu_code"] == 0 && $exchange_item["menu_code"] == 0 && $exchange_item["units_id"] == 0) { $shift_online_item->modificator_code = 1; } else { $shift_online_item->modificator_code = 0; diff --git a/composer.json b/composer.json index a33af6d..99f0e4e 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "hrc-admin/hello-world", - "version": "2.8", + "version": "2.9", "require": { "horeca/admin-php-module-core": "dev-master" }, diff --git a/database/migrations/2022_01_26_210748_create_action_types_table.php b/database/migrations/2022_01_26_210748_create_action_types_table.php new file mode 100644 index 0000000..02e67c1 --- /dev/null +++ b/database/migrations/2022_01_26_210748_create_action_types_table.php @@ -0,0 +1,34 @@ +id(); + $table->string('name', 255)->nullable(); + $table->integer('type_id')->nullable(); + $table->timestamps(); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() { + Schema::table('action_types', function (Blueprint $table) { + // + }); + } +} diff --git a/database/seeders/AddActionTypes.php b/database/seeders/AddActionTypes.php new file mode 100644 index 0000000..dc12e2d --- /dev/null +++ b/database/seeders/AddActionTypes.php @@ -0,0 +1,67 @@ + 'Заказ открыт', 'type_id' => 1], + ['name' => 'Добавлена позиция', 'type_id' => 2], + ['name' => 'Удалена позиция', 'type_id' => 5], + ['name' => 'Заказ закрыт', 'type_id' => 6], + ['name' => 'Заказ отложен', 'type_id' => 7], + ['name' => 'Заказ удален', 'type_id' => 8], + ['name' => 'Клиент добавлен', 'type_id' => 11], + ['name' => 'Клиент отменен', 'type_id' => 12], + ['name' => 'Добавлен модификатор', 'type_id' => 15], + ['name' => 'Удален модификатор', 'type_id' => 16], + ['name' => 'Начат возврат заказа', 'type_id' => 17], + ['name' => 'Отмена возврата заказа', 'type_id' => 18], + ['name' => 'Заказ возвращен', 'type_id' => 19], + ['name' => 'Возврат заказа окончен', 'type_id' => 20], + ['name' => 'Печать завершена', 'type_id' => 21], + ['name' => 'Отмена позиции', 'type_id' => 22], + ['name' => 'Ошибка печати', 'type_id' => 23], + ['name' => 'Наличными', 'type_id' => 24], + ['name' => 'Безналичными', 'type_id' => 25], + ['name' => 'Кредитной картой', 'type_id' => 26], + ['name' => 'Питание штата', 'type_id' => 27], + ['name' => 'Аванс', 'type_id' => 28], + ['name' => 'Остаток', 'type_id' => 29], + ['name' => 'Удалены все позиции', 'type_id' => 30], + ['name' => 'Начато объединение', 'type_id' => 31], + ['name' => 'Объединение окончено', 'type_id' => 32], + ['name' => 'Начато разбиение', 'type_id' => 33], + ['name' => 'Разбиение окончено', 'type_id' => 34], + ['name' => 'Конечный заказ разбиения', 'type_id' => 35], + ['name' => 'Заказ открыт администратором', 'type_id' => 36], + ['name' => 'Заказ заблокирован', 'type_id' => 37], + ['name' => 'Заказ разблокирован', 'type_id' => 38], + ['name' => 'Перевод', 'type_id' => 39], + ['name' => 'Custom', 'type_id' => 40], + ['name' => 'Заказ перенесен', 'type_id' => 41], + ['name' => 'Здравница', 'type_id' => 42], + ['name' => 'Аннулирование заказа', 'type_id' => 43], + ['name' => 'Открыть с перезагрузки', 'type_id' => 44], + ['name' => 'Место заказа', 'type_id' => 45], + ['name' => 'Количество клиентов', 'type_id' => 46], + ['name' => 'Изменить курс', 'type_id' => 47], + ['name' => 'Бонус', 'type_id' => 48], + ['name' => 'Внесение денежных средств', 'type_id' => 49], + ['name' => 'Выплата денежных средств', 'type_id' => 50], + ['name' => 'Электронными деньгами', 'type_id' => 51], + ['name' => 'Заказ вызван', 'type_id' => 52], + ], ['name'], ['type_id'] + ); + } + } +} diff --git a/models/ActionTypes.php b/models/ActionTypes.php new file mode 100644 index 0000000..4beb000 --- /dev/null +++ b/models/ActionTypes.php @@ -0,0 +1,15 @@ +

- -

- -

-

-
-
- -

-

-
- -
+ +
+ +

+

+
+ +

+

+
+ +
- +
@@ -56,26 +55,27 @@ - - + - - + - - + -
#НаименованиеНаимен. КоличествоЦенаИтогоИтог #
{{ item.num }}{{ item.item_name }} + {{ item.item_name }} +

+ {{ item.item_price }} BYN +

+
{{ item.item_price }} BYN {{ item.item_price * item.item_count }} BYN + + + + +
+
+ + + +
+
+
+ + +
+ + + +
+ + + + + +
+ +
+ + \ No newline at end of file diff --git a/web/views/orders/selectmenuitem.html b/web/views/orders/selectmenuitem.html index 87872d6..226d76f 100644 --- a/web/views/orders/selectmenuitem.html +++ b/web/views/orders/selectmenuitem.html @@ -53,48 +53,23 @@ -
-
-
  • -
    - - - -
    - -
    -
    -
    -
    - {{ item.name }} #{{ item.code }} - {{ item.cosht | curr }} BYN -
    -
    -
    - - - -
    -
    -
    -
    - - - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    • +
    +
    +
    + +

    +
    + +