Merge branch 'develop'

tastyigniter · Oct 17, 2021 · 14fc954 · 14fc954
2 parents 9e1491f + c1cfb18
commit 14fc954
Show file tree

Hide file tree

Showing 34 changed files with 381 additions and 197 deletions.
diff --git a/app/admin/bulkactionwidgets/Delete.php b/app/admin/bulkactionwidgets/Delete.php
@@ -3,16 +3,19 @@
 namespace Admin\BulkActionWidgets;
 
 use Admin\Classes\BaseBulkActionWidget;
+use Illuminate\Support\Facades\DB;
 
 class Delete extends BaseBulkActionWidget
 {
     public function handleAction($requestData, $records)
     {
         // Delete records
         if ($count = $records->count()) {
-            foreach ($records as $record) {
-                $record->delete();
-            }
+            DB::transaction(function () use ($records) {
+                foreach ($records as $record) {
+                    $record->delete();
+                }
+            });
 
             $prefix = ($count > 1) ? ' records' : 'record';
             flash()->success(sprintf(lang('admin::lang.alert_success'), '['.$count.']'.$prefix.' '.lang('admin::lang.text_deleted')));

diff --git a/app/admin/bulkactionwidgets/Status.php b/app/admin/bulkactionwidgets/Status.php
@@ -3,6 +3,7 @@
 namespace Admin\BulkActionWidgets;
 
 use Admin\Classes\BaseBulkActionWidget;
+use Illuminate\Support\Facades\DB;
 
 class Status extends BaseBulkActionWidget
 {
@@ -19,11 +20,15 @@ public function handleAction($requestData, $records)
     {
         $code = array_get($requestData, 'code');
         [$actionCode, $statusCode] = explode('.', $code, 2);
+        $statusColumn = $this->statusColumn;
 
         if ($count = $records->count()) {
-            foreach ($records as $record) {
-                $record->update([$this->statusColumn => ($statusCode === 'enable')]);
-            }
+            DB::transaction(function () use ($records, $statusColumn, $statusCode) {
+                foreach ($records as $record) {
+                    $record->$statusColumn = ($statusCode === 'enable');
+                    $record->save();
+                }
+            });
 
             $prefix = ($count > 1) ? ' records' : 'record';
             flash()->success(sprintf(lang('admin::lang.alert_success'),

diff --git a/app/admin/models/Customers_model.php b/app/admin/models/Customers_model.php
@@ -254,9 +254,12 @@ public function mailGetRecipients($type)
 
     public function mailGetData()
     {
+        $model = $this->fresh();
+
         return [
-            'full_name' => $this->full_name,
-            'email' => $this->email,
+            'customer' => $model,
+            'full_name' => $model->full_name,
+            'email' => $model->email,
         ];
     }
 }
diff --git a/app/admin/models/Orders_model.php b/app/admin/models/Orders_model.php
@@ -340,6 +340,7 @@ public function mailGetData()
         $data = [];
 
         $model = $this->fresh();
+        $data['order'] = $model;
         $data['order_number'] = $model->order_id;
         $data['order_id'] = $model->order_id;
         $data['first_name'] = $model->first_name;
@@ -404,6 +405,7 @@ public function mailGetData()
         if ($model->location) {
             $data['location_name'] = $model->location->location_name;
             $data['location_email'] = $model->location->location_email;
+            $data['location_telephone'] = $model->location->location_telephone;
             $data['location_address'] = format_address($model->location->getAddress());
         }
 

diff --git a/app/admin/models/Reservations_model.php b/app/admin/models/Reservations_model.php
@@ -175,7 +175,7 @@ public function scopeWhereBetweenReservationDateTime($query, $start, $end)
     public function scopeWhereBetweenDate($query, $dateTime)
     {
         $query->whereRaw(
-            '? between ADDTIME(reserve_date, reserve_time)'.
+            '? between DATE_SUB(ADDTIME(reserve_date, reserve_time), INTERVAL (duration - 2) MINUTE)'.
             ' and DATE_ADD(ADDTIME(reserve_date, reserve_time), INTERVAL duration MINUTE)',
             [$dateTime]
         );
@@ -422,6 +422,7 @@ public function mailGetData()
         $data = [];
 
         $model = $this->fresh();
+        $data['reservation'] = $model;
         $data['reservation_number'] = $model->reservation_id;
         $data['reservation_id'] = $model->reservation_id;
         $data['reservation_time'] = Carbon::createFromTimeString($model->reserve_time)->format(lang('system::lang.php.time_format'));
@@ -436,6 +437,7 @@ public function mailGetData()
         if ($model->location) {
             $data['location_name'] = $model->location->location_name;
             $data['location_email'] = $model->location->location_email;
+            $data['location_telephone'] = $model->location->location_telephone;
         }
 
         $statusHistory = Status_history_model::applyRelated($model)->whereStatusIsLatest($model->status_id)->first();

diff --git a/app/admin/models/Users_model.php b/app/admin/models/Users_model.php
@@ -175,10 +175,13 @@ public function mailGetRecipients($type)
 
     public function mailGetData()
     {
+        $model = $this->fresh();
+
         return [
-            'staff_name' => $this->staff_name,
-            'staff_email' => $this->staff->staff_email,
-            'username' => $this->username,
+            'staff' => $model,
+            'staff_name' => $model->staff_name,
+            'staff_email' => $model->staff->staff_email,
+            'username' => $model->username,
         ];
     }
 }
diff --git a/app/admin/models/config/allergens_model.php b/app/admin/models/config/allergens_model.php
@@ -20,16 +20,33 @@
             'class' => 'btn btn-primary',
             'href' => 'allergens/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
+];
+
+$config['list']['bulkActions'] = [
+    'status' => [
+        'label' => 'lang:admin::lang.list.actions.label_status',
+        'type' => 'dropdown',
+        'class' => 'btn btn-light',
+        'statusColumn' => 'status',
+        'menuItems' => [
+            'enable' => [
+                'label' => 'lang:admin::lang.list.actions.label_enable',
+                'type' => 'button',
+                'class' => 'dropdown-item',
+            ],
+            'disable' => [
+                'label' => 'lang:admin::lang.list.actions.label_disable',
+                'type' => 'button',
+                'class' => 'dropdown-item text-danger',
+            ],
         ],
     ],
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
 ];
 
 $config['list']['columns'] = [

diff --git a/app/admin/models/config/categories_model.php b/app/admin/models/config/categories_model.php
@@ -53,7 +53,6 @@
     'delete' => [
         'label' => 'lang:admin::lang.button_delete',
         'class' => 'btn btn-light text-danger',
-        'data-request-data' => "_method:'DELETE'",
         'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
     ],
 ];

diff --git a/app/admin/models/config/customer_groups_model.php b/app/admin/models/config/customer_groups_model.php
@@ -11,15 +11,14 @@
             'class' => 'btn btn-primary',
             'href' => 'customer_groups/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
-        ],
+    ],
+];
+
+$config['list']['bulkActions'] = [
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
     ],
 ];
 

diff --git a/app/admin/models/config/customers_model.php b/app/admin/models/config/customers_model.php
@@ -24,15 +24,6 @@
             'class' => 'btn btn-primary',
             'href' => 'customers/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
-        ],
         'groups' => [
             'label' => 'lang:admin::lang.side_menu.customer_group',
             'class' => 'btn btn-default',
@@ -42,6 +33,32 @@
     ],
 ];
 
+$config['list']['bulkActions'] = [
+    'status' => [
+        'label' => 'lang:admin::lang.list.actions.label_status',
+        'type' => 'dropdown',
+        'class' => 'btn btn-light',
+        'statusColumn' => 'status',
+        'menuItems' => [
+            'enable' => [
+                'label' => 'lang:admin::lang.list.actions.label_enable',
+                'type' => 'button',
+                'class' => 'dropdown-item',
+            ],
+            'disable' => [
+                'label' => 'lang:admin::lang.list.actions.label_disable',
+                'type' => 'button',
+                'class' => 'dropdown-item text-danger',
+            ],
+        ],
+    ],
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
+];
+
 $config['list']['columns'] = [
     'edit' => [
         'type' => 'button',

diff --git a/app/admin/models/config/locations_model.php b/app/admin/models/config/locations_model.php
@@ -21,16 +21,33 @@
             'class' => 'btn btn-primary',
             'href' => 'locations/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
+];
+
+$config['list']['bulkActions'] = [
+    'status' => [
+        'label' => 'lang:admin::lang.list.actions.label_status',
+        'type' => 'dropdown',
+        'class' => 'btn btn-light',
+        'statusColumn' => 'location_status',
+        'menuItems' => [
+            'enable' => [
+                'label' => 'lang:admin::lang.list.actions.label_enable',
+                'type' => 'button',
+                'class' => 'dropdown-item',
+            ],
+            'disable' => [
+                'label' => 'lang:admin::lang.list.actions.label_disable',
+                'type' => 'button',
+                'class' => 'dropdown-item text-danger',
+            ],
         ],
     ],
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
 ];
 
 $config['list']['columns'] = [

diff --git a/app/admin/models/config/mealtimes_model.php b/app/admin/models/config/mealtimes_model.php
@@ -24,16 +24,33 @@
             'class' => 'btn btn-primary',
             'href' => 'mealtimes/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
+];
+
+$config['list']['bulkActions'] = [
+    'status' => [
+        'label' => 'lang:admin::lang.list.actions.label_status',
+        'type' => 'dropdown',
+        'class' => 'btn btn-light',
+        'statusColumn' => 'mealtime_status',
+        'menuItems' => [
+            'enable' => [
+                'label' => 'lang:admin::lang.list.actions.label_enable',
+                'type' => 'button',
+                'class' => 'dropdown-item',
+            ],
+            'disable' => [
+                'label' => 'lang:admin::lang.list.actions.label_disable',
+                'type' => 'button',
+                'class' => 'dropdown-item text-danger',
+            ],
         ],
     ],
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
 ];
 
 $config['list']['columns'] = [

diff --git a/app/admin/models/config/menus_model.php b/app/admin/models/config/menus_model.php
@@ -35,15 +35,6 @@
             'class' => 'btn btn-primary',
             'href' => 'menus/create',
         ],
-        'delete' => [
-            'label' => 'lang:admin::lang.button_delete',
-            'class' => 'btn btn-danger',
-            'data-attach-loading' => '',
-            'data-request' => 'onDelete',
-            'data-request-form' => '#list-form',
-            'data-request-data' => "_method:'DELETE'",
-            'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
-        ],
         'allergens' => [
             'label' => 'lang:admin::lang.allergens.text_allergens',
             'class' => 'btn btn-default',
@@ -53,6 +44,32 @@
     ],
 ];
 
+$config['list']['bulkActions'] = [
+    'status' => [
+        'label' => 'lang:admin::lang.list.actions.label_status',
+        'type' => 'dropdown',
+        'class' => 'btn btn-light',
+        'statusColumn' => 'menu_status',
+        'menuItems' => [
+            'enable' => [
+                'label' => 'lang:admin::lang.list.actions.label_enable',
+                'type' => 'button',
+                'class' => 'dropdown-item',
+            ],
+            'disable' => [
+                'label' => 'lang:admin::lang.list.actions.label_disable',
+                'type' => 'button',
+                'class' => 'dropdown-item text-danger',
+            ],
+        ],
+    ],
+    'delete' => [
+        'label' => 'lang:admin::lang.button_delete',
+        'class' => 'btn btn-light text-danger',
+        'data-request-confirm' => 'lang:admin::lang.alert_warning_confirm',
+    ],
+];
+
 $config['list']['columns'] = [
     'edit' => [
         'type' => 'button',