From 1b1428bff93d4c1f0866015d1ed5549939058d9d Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Sat, 18 Sep 2021 08:36:18 +0100 Subject: [PATCH 01/24] Allow extension of scopeListFrontEnd query through events (#863) * Allow extension of scopeListFrontEnd query through events * Remove model param * Use local event to isolate * wip Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/models/Addresses_model.php | 2 ++ app/admin/models/Categories_model.php | 2 ++ app/admin/models/Locations_model.php | 2 ++ app/admin/models/Menus_model.php | 2 ++ app/admin/models/Orders_model.php | 2 ++ app/admin/models/Reservations_model.php | 2 ++ app/admin/models/Reviews_model.php | 2 ++ app/system/models/Currencies_model.php | 2 ++ 8 files changed, 16 insertions(+) diff --git a/app/admin/models/Addresses_model.php b/app/admin/models/Addresses_model.php index 9fdcc8894f..82b8fc8195 100644 --- a/app/admin/models/Addresses_model.php +++ b/app/admin/models/Addresses_model.php @@ -80,6 +80,8 @@ public function scopeListFrontEnd($query, $options = []) } } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/admin/models/Categories_model.php b/app/admin/models/Categories_model.php index bd0448bd07..9382ce3777 100644 --- a/app/admin/models/Categories_model.php +++ b/app/admin/models/Categories_model.php @@ -151,6 +151,8 @@ public function scopeListFrontEnd($query, $options = []) $query->isEnabled(); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } } diff --git a/app/admin/models/Locations_model.php b/app/admin/models/Locations_model.php index 8016c76050..d111ea7c66 100644 --- a/app/admin/models/Locations_model.php +++ b/app/admin/models/Locations_model.php @@ -171,6 +171,8 @@ public function scopeListFrontEnd($query, array $options = []) $query->search($search, $searchableFields); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/admin/models/Menus_model.php b/app/admin/models/Menus_model.php index f0bc3f964e..d13d8b6868 100644 --- a/app/admin/models/Menus_model.php +++ b/app/admin/models/Menus_model.php @@ -159,6 +159,8 @@ public function scopeListFrontEnd($query, $options = []) }); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/admin/models/Orders_model.php b/app/admin/models/Orders_model.php index 2ab8345407..7a9f67b8d0 100644 --- a/app/admin/models/Orders_model.php +++ b/app/admin/models/Orders_model.php @@ -164,6 +164,8 @@ public function scopeListFrontEnd($query, $options = []) $query = $this->scopeWhereBetweenOrderDateTime($query, Carbon::parse($startDateTime)->format('Y-m-d H:i:s'), Carbon::parse($endDateTime)->format('Y-m-d H:i:s')); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/admin/models/Reservations_model.php b/app/admin/models/Reservations_model.php index eca4983096..9353097440 100644 --- a/app/admin/models/Reservations_model.php +++ b/app/admin/models/Reservations_model.php @@ -160,6 +160,8 @@ public function scopeListFrontEnd($query, $options = []) $query = $this->scopeWhereBetweenReservationDateTime($query, Carbon::parse($startDateTime)->format('Y-m-d H:i:s'), Carbon::parse($endDateTime)->format('Y-m-d H:i:s')); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/admin/models/Reviews_model.php b/app/admin/models/Reviews_model.php index 5f831fbb04..f9f3af1ad0 100644 --- a/app/admin/models/Reviews_model.php +++ b/app/admin/models/Reviews_model.php @@ -122,6 +122,8 @@ public function scopeListFrontEnd($query, $options = []) } } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } diff --git a/app/system/models/Currencies_model.php b/app/system/models/Currencies_model.php index f22f251d25..2b24b478c4 100644 --- a/app/system/models/Currencies_model.php +++ b/app/system/models/Currencies_model.php @@ -81,6 +81,8 @@ public function scopeListFrontEnd($query, $options = []) $query->isEnabled(); } + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + return $query->paginate($pageLimit, $page); } From 86a15711b45476b7ee7299f04c44fbbfd8913bde Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:01:28 +0100 Subject: [PATCH 02/24] Auto ignore other updates when core is available --- app/system/classes/UpdateManager.php | 5 +- app/system/controllers/Updates.php | 6 -- app/system/language/en/lang.php | 2 +- app/system/views/updates/list.blade.php | 2 - app/system/views/updates/list_items.blade.php | 100 ++++++++++++------ 5 files changed, 72 insertions(+), 43 deletions(-) diff --git a/app/system/classes/UpdateManager.php b/app/system/classes/UpdateManager.php index 7224f0b28b..615bbc5aeb 100644 --- a/app/system/classes/UpdateManager.php +++ b/app/system/classes/UpdateManager.php @@ -362,6 +362,8 @@ public function requestUpdateList($force = FALSE) $installedItems = collect($installedItems)->keyBy('name')->all(); + $coreUpdate = collect(array_get($updates, 'data', []))->firstWhere('type', 'core'); + $updateCount = 0; foreach (array_get($updates, 'data', []) as $update) { $updateCount++; @@ -370,13 +372,12 @@ public function requestUpdateList($force = FALSE) $update = $this->parseTagDescription($update); if (array_get($update, 'type') == 'core') { - $update['icon'] = 'logo-icon icon-ti-logo'; $update['installedVer'] = params('ti_version'); if ($this->disableCoreUpdates) continue; } - if ($this->isMarkedAsIgnored($update['code'])) { + if ((array_get($update, 'type') !== 'core' AND $coreUpdate) OR $this->isMarkedAsIgnored($update['code'])) { $ignoredItems[] = $update; continue; } diff --git a/app/system/controllers/Updates.php b/app/system/controllers/Updates.php index 460e41bcb8..04bafe0ec2 100644 --- a/app/system/controllers/Updates.php +++ b/app/system/controllers/Updates.php @@ -208,14 +208,8 @@ protected function applyCarte() protected function applyInstallOrUpdate($context) { - $error = null; - $items = input('items') ?? []; -// Uncomment this block to require carte key -// if (!params()->has('carte_key')) -// throw new ApplicationException(lang('system::lang.missing.carte_key')); - if (!count($items)) throw new ApplicationException(lang('system::lang.updates.alert_no_items')); diff --git a/app/system/language/en/lang.php b/app/system/language/en/lang.php index e96bd42f14..8511737b5e 100644 --- a/app/system/language/en/lang.php +++ b/app/system/language/en/lang.php @@ -615,7 +615,7 @@ 'text_update_ignored' => '%s update(s) ignored', 'text_item_update_summary' => 'Update from version %s to %s', - 'text_maintenance_mode' => 'While your site is being updated, maintenance mode will be enabled then disabled as soon as your updates are complete.', + 'text_core_update' => '  After the core has been updated, other updates will be available.', 'progress_download' => '   Downloading %s…', 'progress_extract' => '   Extracting %s…', diff --git a/app/system/views/updates/list.blade.php b/app/system/views/updates/list.blade.php index 28df76a157..26105bc184 100644 --- a/app/system/views/updates/list.blade.php +++ b/app/system/views/updates/list.blade.php @@ -11,8 +11,6 @@ -
@lang('system::lang.updates.text_maintenance_mode')
- {!! $this->makePartial('updates/list_items', ['items' => $updates['items'], 'ignored' => FALSE]) !!} @endif diff --git a/app/system/views/updates/list_items.blade.php b/app/system/views/updates/list_items.blade.php index a97e0a7cd2..8c7c821d6d 100644 --- a/app/system/views/updates/list_items.blade.php +++ b/app/system/views/updates/list_items.blade.php @@ -1,11 +1,35 @@
@foreach ($items as $item)
-
- +
+ @if ($item['type'] === 'core') + + + + + + + + + + + + + + + + + @else + + @endif
{{ $item['name'] }} @@ -17,34 +41,46 @@ class="extension-icon rounded" @endif
-
- @if ($ignored) - - @else - - @endif -
+ @if ($item['type'] === 'core') +
+ @else +
+ @if ($ignored) + + @else + + @endif +
+ @endif
+ @if ($item['type'] === 'core') +
@lang('system::lang.updates.text_core_update')
+ @endif @endforeach
From 80c657b5b5781ba6840f45ff4fdc3dc70151c1a6 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:02:22 +0100 Subject: [PATCH 03/24] Drop support for PHP 7.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 84eabbd04e..7ac0fbca0d 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "source": "https://github.com/tastyigniter/TastyIgniter" }, "require": { - "php": ">=7.3", + "php": ">=7.4", "tastyigniter/flame": "~1.2", "laravel/framework": "~8.0" }, From 26989a6ae838f94a2267661469b5d493124df42d Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Thu, 23 Sep 2021 00:09:24 +0100 Subject: [PATCH 04/24] Drop support for PHP 7.3 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b005d7e0d8..7874cac470 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: max-parallel: 6 matrix: # os: [ubuntu-latest, windows-latest] - php: ['7.3', '7.4'] + php: ['7.4', '8.0'] db: ['mysql:5.7', mariadb] include: - db: 'mysql:5.7' From 46949b34f9ec31008fd85568610293b1635919e9 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Thu, 23 Sep 2021 13:32:38 +0100 Subject: [PATCH 05/24] Allow filtering by location status, hasDelivery or hasCollection (#853) * Allow filtering by order type and delivery area If orderTypes param is passed then make sure the locations offer it. If searchDeliveryAreas is passed then filter locations by whether they deliver to those coordinates * Move filter logic to localList component Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/models/Locations_model.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/admin/models/Locations_model.php b/app/admin/models/Locations_model.php index d111ea7c66..435f50503a 100644 --- a/app/admin/models/Locations_model.php +++ b/app/admin/models/Locations_model.php @@ -131,13 +131,17 @@ public function scopeIsEnabled($query) public function scopeListFrontEnd($query, array $options = []) { - extract(array_merge([ + extract($options = array_merge([ 'page' => 1, 'pageLimit' => 20, 'sort' => null, 'search' => null, + 'enabled' => null, 'latitude' => null, 'longitude' => null, + 'paginate' => TRUE, + 'hasDelivery' => null, + 'hasCollection' => null, ], $options)); if ($latitude AND $longitude) { @@ -171,8 +175,20 @@ public function scopeListFrontEnd($query, array $options = []) $query->search($search, $searchableFields); } + if (!is_null($enabled)) + $query->where('location_status', $enabled); + + if (!is_null($hasDelivery)) + $query->where('options->offer_delivery', $hasDelivery); + + if (!is_null($hasCollection)) + $query->where('options->offer_collection', $hasCollection); + $this->fireEvent('model.extendListFrontEndQuery', [$query]); + if (is_null($pageLimit)) + return $query; + return $query->paginate($pageLimit, $page); } From fd399d8fef4f934eff35268a890c30ed29925ca8 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Thu, 23 Sep 2021 13:30:04 +0100 Subject: [PATCH 06/24] Bring back getAction and getClass methods on AdminController Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/classes/AdminController.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/admin/classes/AdminController.php b/app/admin/classes/AdminController.php index 9eb05f0ec8..cc529eeed0 100644 --- a/app/admin/classes/AdminController.php +++ b/app/admin/classes/AdminController.php @@ -256,6 +256,16 @@ public function pageAction() $this->execPageAction($this->action, $this->params); } + public function getClass() + { + return $this->class; + } + + public function getAction() + { + return $this->action; + } + protected function execPageAction($action, $params) { $result = null; From 464943bf09eee80fd5562b2af3c6d43b217b0cf0 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:18:08 +0100 Subject: [PATCH 07/24] Improved password reset flow by no longer throwing an error if the provided email address doesn't exist. Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/controllers/Login.php | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/admin/controllers/Login.php b/app/admin/controllers/Login.php index 846dd8aaec..f91b3f47f4 100644 --- a/app/admin/controllers/Login.php +++ b/app/admin/controllers/Login.php @@ -85,24 +85,21 @@ public function onRequestResetPassword() $data = post(); $this->validate($data, [ - ['email', 'lang:admin::lang.label_email', 'required|email:filter|max:96|exists:staffs,staff_email'], + ['email', 'lang:admin::lang.label_email', 'required|email:filter|max:96'], ]); $staff = Staffs_model::whereStaffEmail(post('email'))->first(); - if (!$staff OR !$user = $staff->user) - throw new ValidationException(['email' => lang('admin::lang.login.alert_email_not_sent')]); - - if (!$user->resetPassword()) - throw new ValidationException(['email' => lang('admin::lang.login.alert_failed_reset')]); - - $data = [ - 'staff_name' => $staff->staff_name, - 'reset_link' => admin_url('login/reset?code='.$user->reset_code), - ]; - - Mail::queue('admin::_mail.password_reset_request', $data, function ($message) use ($staff) { - $message->to($staff->staff_email, $staff->staff_name); - }); + if ($staff AND $user = $staff->user) { + if (!$user->resetPassword()) + throw new ValidationException(['email' => lang('admin::lang.login.alert_failed_reset')]); + $data = [ + 'staff_name' => $staff->staff_name, + 'reset_link' => admin_url('login/reset?code='.$user->reset_code), + ]; + Mail::queue('admin::_mail.password_reset_request', $data, function ($message) use ($staff) { + $message->to($staff->staff_email, $staff->staff_name); + }); + } flash()->success(lang('admin::lang.login.alert_email_sent')); From ae0a53295bbfd956ec539810989d6a1b1c9b2aeb Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:51:29 +0100 Subject: [PATCH 08/24] Enable "Customize" button for only the currently active theme Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/views/themes/lists/list_buttons.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/views/themes/lists/list_buttons.blade.php b/app/system/views/themes/lists/list_buttons.blade.php index d497b103d7..2b2c21fd04 100644 --- a/app/system/views/themes/lists/list_buttons.blade.php +++ b/app/system/views/themes/lists/list_buttons.blade.php @@ -1,6 +1,6 @@ {!! $this->makePartial('lists/list_button', ['record' => $theme, 'column' => $this->getColumn('source')]) !!} -@if ($theme->getTheme()->hasCustomData()) +@if ($theme->getTheme()->isActive() AND $theme->getTheme()->hasCustomData()) {!! $this->makePartial('lists/list_button', ['record' => $theme, 'column' => $this->getColumn('edit')]) !!} @endif From 205576113bbf233b37fc6213a3cfcceb818122b5 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 25 Sep 2021 09:13:59 +0100 Subject: [PATCH 09/24] Move search/browse marketplace feature to themes and extension controllers --- app/admin/assets/css/admin.css | 15 +- .../assets/scss/components/_toolbar.scss | 3 + app/system/assets/ui/js/updates.js | 28 +- app/system/controllers/Extensions.php | 4 + app/system/controllers/Themes.php | 4 + app/system/controllers/Updates.php | 329 +----------------- app/system/language/en/lang.php | 18 +- app/system/models/config/extensions_model.php | 7 +- app/system/models/config/themes_model.php | 5 +- app/system/traits/ManagesUpdates.php | 308 ++++++++++++++++ app/system/views/extensions/index.blade.php | 9 +- .../views/extensions/lists/list.blade.php | 4 +- app/system/views/themes/index.blade.php | 6 +- app/system/views/themes/lists/list.blade.php | 2 + .../views/updates/browse/extension.blade.php | 35 -- .../views/updates/browse/index.blade.php | 25 -- .../views/updates/browse/list.blade.php | 9 - .../views/updates/browse/theme.blade.php | 32 -- .../views/updates/list_recommended.blade.php | 63 ++++ .../views/updates/recommended.blade.php | 16 + app/system/views/updates/search.blade.php | 35 +- 21 files changed, 478 insertions(+), 479 deletions(-) create mode 100644 app/system/traits/ManagesUpdates.php delete mode 100644 app/system/views/updates/browse/extension.blade.php delete mode 100644 app/system/views/updates/browse/index.blade.php delete mode 100644 app/system/views/updates/browse/list.blade.php delete mode 100644 app/system/views/updates/browse/theme.blade.php create mode 100644 app/system/views/updates/list_recommended.blade.php create mode 100644 app/system/views/updates/recommended.blade.php diff --git a/app/admin/assets/css/admin.css b/app/admin/assets/css/admin.css index 719b847406..5e1b775440 100644 --- a/app/admin/assets/css/admin.css +++ b/app/admin/assets/css/admin.css @@ -1,8 +1,8 @@ +@charset "UTF-8"; /*! * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) */ -@charset "UTF-8"; .fa, .fas, .far, .fa-star-o, .fal, .fad, .fab { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; @@ -10755,12 +10755,12 @@ a.btn.disabled, fieldset:disabled a.btn { } .btn-info:hover { color: #FFFFFF; - background-color: #3b4bd1; + background-color: #3b4ad1; border-color: #3141ce; } .btn-info:focus, .btn-info.focus { color: #FFFFFF; - background-color: #3b4bd1; + background-color: #3b4ad1; border-color: #3141ce; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 3, 41, 0.075) 0 0 0 0.2rem rgba(115, 126, 222, 0.5); } @@ -16561,7 +16561,7 @@ a.text-success:hover, a.panel-success:hover, a.text-success:focus, a.panel-succe color: #5A67D8 !important; } a.text-info:hover, a.panel-info:hover, a.text-info:focus, a.panel-info:focus { - color: #2c3bba !important; + color: #2c3aba !important; } .text-warning, .panel-warning { color: #FD7E14 !important; @@ -18317,12 +18317,12 @@ body.dragging .dragged { } .toolbar-action .btn-info:hover { color: #FFFFFF; - background-color: #3b4bd1; + background-color: #3b4ad1; border-color: #3141ce; } .toolbar-action .btn-info:focus, .toolbar-action .btn-info.focus { color: #FFFFFF; - background-color: #3b4bd1; + background-color: #3b4ad1; border-color: #3141ce; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 3, 41, 0.075) 0 0 0 0.2rem rgba(133, 143, 171, 0.5); } @@ -18735,6 +18735,9 @@ body.dragging .dragged { .toolbar-action .btn-outline-white:not(:disabled):not(.disabled):active:focus, .toolbar-action .btn-outline-white:not(:disabled):not(.disabled).active:focus, .show > .toolbar-action .btn-outline-white.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(111, 123, 156, 0.5); } +.toolbar-search { + background-color: #D2D4DF; +} .list-table .table thead, .list-table .markdown table thead, .markdown .list-table table thead { position: relative; } diff --git a/app/admin/assets/scss/components/_toolbar.scss b/app/admin/assets/scss/components/_toolbar.scss index c65c3cd2b5..5c432bd631 100644 --- a/app/admin/assets/scss/components/_toolbar.scss +++ b/app/admin/assets/scss/components/_toolbar.scss @@ -104,3 +104,6 @@ } } } +.toolbar-search { + background-color: $gray-300; +} diff --git a/app/system/assets/ui/js/updates.js b/app/system/assets/ui/js/updates.js index 745f5deab6..d86237f2e7 100644 --- a/app/system/assets/ui/js/updates.js +++ b/app/system/assets/ui/js/updates.js @@ -40,6 +40,8 @@ $(document).on('click', '#update-carte', $.proxy(this.onUpdateCarteClick, this)) + $(document).on('click', '[data-control="apply-recommended"]', $.proxy(this.onApplyRecommended, this)) + $(document).on('click', '#apply-updates', $.proxy(this.onApplyUpdateClick, this)) $(document).on('click', '[data-control="apply-install"]', $.proxy(this.onApplyInstallClick, this)) @@ -65,7 +67,7 @@ requestChain.push(function () { var deferred = $.Deferred() - $.request('onProcess', { + $.request('onProcessItems', { data: {step: group, meta: step}, beforeSend: self.setProgressBar(step.label, 'primary'), success: function (json) { @@ -257,7 +259,7 @@ $button.attr('disable', true).addClass('disabled') - $.request('onApply', { + $.request('onApplyItems', { data: {items: this.options.itemsToApply} }).always(function () { $button.attr('disable', false).removeClass('disabled') @@ -290,7 +292,7 @@ }) }) - $.request('onApply', { + $.request('onApplyUpdate', { data: {items: this.options.itemsToApply} }).always(function () { $button.attr('disable', false).removeClass('disabled') @@ -324,6 +326,22 @@ }) } + Updates.prototype.onApplyRecommended = function (event) { + var self = this, + $button = $(event.currentTarget), + $modal = $button.closest('.modal'), + $form = $button.closest('form') + + $button.attr('disabled', true) + + $form.request('onApplyItems').always(function () { + $modal.modal('hide') + }).done(function (json) { + if (json['steps']) + self.executeSteps(json['steps']) + }) + } + Updates.prototype.bindSearch = function (field) { var self = this, $field = $(field), @@ -491,7 +509,7 @@ $.fn.updates.Constructor = Updates $(document).render(function () { - $('#list-items').updates() + $('.page-content').updates() }) -}(jQuery) \ No newline at end of file +}(jQuery) diff --git a/app/system/controllers/Extensions.php b/app/system/controllers/Extensions.php index aca5109960..5ed48a1897 100644 --- a/app/system/controllers/Extensions.php +++ b/app/system/controllers/Extensions.php @@ -9,6 +9,7 @@ use Igniter\Flame\Exception\ApplicationException; use Igniter\Flame\Exception\SystemException; use Illuminate\Support\Facades\Request; +use System\Traits\ManagesUpdates; use System\Classes\ExtensionManager; use System\Models\Extensions_model; use System\Models\Settings_model; @@ -16,6 +17,7 @@ class Extensions extends \Admin\Classes\AdminController { use WidgetMaker; + use ManagesUpdates; public $implement = [ 'Admin\Actions\ListController', @@ -59,6 +61,8 @@ public function index() Extensions_model::syncAll(); + $this->initUpdate('extension'); + $this->asExtension('ListController')->index(); } diff --git a/app/system/controllers/Themes.php b/app/system/controllers/Themes.php index 583ec53843..fd9ecdfcc9 100644 --- a/app/system/controllers/Themes.php +++ b/app/system/controllers/Themes.php @@ -15,6 +15,7 @@ use System\Libraries\Assets as AssetsManager; use System\Models\Themes_model; use System\Traits\ConfigMaker; +use System\Traits\ManagesUpdates; use System\Traits\SessionMaker; class Themes extends \Admin\Classes\AdminController @@ -22,6 +23,7 @@ class Themes extends \Admin\Classes\AdminController use WidgetMaker; use ConfigMaker; use SessionMaker; + use ManagesUpdates; public $implement = [ 'Admin\Actions\ListController', @@ -71,6 +73,8 @@ public function index() { Themes_model::syncAll(); + $this->initUpdate('theme'); + $this->asExtension('ListController')->index(); } diff --git a/app/system/controllers/Updates.php b/app/system/controllers/Updates.php index 04bafe0ec2..476cd73534 100644 --- a/app/system/controllers/Updates.php +++ b/app/system/controllers/Updates.php @@ -5,15 +5,15 @@ use Admin\Facades\AdminMenu; use Admin\Facades\Template; use Exception; -use Igniter\Flame\Exception\ApplicationException; -use Main\Classes\ThemeManager; -use System\Classes\ExtensionManager; use System\Classes\UpdateManager; use System\Models\Extensions_model; use System\Models\Themes_model; +use System\Traits\ManagesUpdates; class Updates extends \Admin\Classes\AdminController { + use ManagesUpdates; + public $checkUrl = 'updates'; public $browseUrl = 'updates/browse'; @@ -36,7 +36,6 @@ public function index() Template::setTitle($pageTitle); Template::setHeading($pageTitle); - Template::setButton(sprintf(lang('system::lang.updates.button_browse'), 'extensions'), ['class' => 'btn btn-primary', 'href' => admin_url($this->browseUrl.'/extensions')]); Template::setButton(lang('system::lang.updates.button_check'), ['class' => 'btn btn-success', 'data-request' => 'onCheckUpdates']); Template::setButton(lang('system::lang.updates.button_carte'), ['class' => 'btn btn-default pull-right', 'role' => 'button', 'data-target' => '#carte-modal', 'data-toggle' => 'modal']); @@ -71,332 +70,10 @@ public function index() } } - public function browse($context, $itemType = null) - { - if (!in_array($itemType, ['themes', 'extensions'])) - return $this->redirectBack(); - - $updateManager = UpdateManager::instance(); - - $pageTitle = lang('system::lang.updates.text_tab_title_'.$itemType); - Template::setTitle(sprintf(lang('system::lang.updates.text_browse_title'), $pageTitle)); - Template::setHeading(sprintf(lang('system::lang.updates.text_browse_title'), $pageTitle)); - - $buttonType = ($itemType == 'extensions') ? 'themes' : 'extensions'; - $buttonTitle = lang('system::lang.updates.text_tab_title_'.$buttonType); - - Template::setButton(sprintf(lang('system::lang.updates.button_browse'), $buttonTitle), ['class' => 'btn btn-primary', 'href' => admin_url($this->browseUrl.'/'.$buttonType)]); - Template::setButton(lang('system::lang.updates.button_updates'), ['class' => 'btn btn-success', 'href' => admin_url($this->checkUrl)]); - Template::setButton(lang('system::lang.updates.button_carte'), ['class' => 'btn btn-default pull-right', 'role' => 'button', 'data-target' => '#carte-modal', 'data-toggle' => 'modal']); - - $this->prepareAssets(); - - $this->vars['searchActionUrl'] = admin_url('updates/search'); - $this->vars['itemType'] = str_singular($itemType); - $this->vars['carteInfo'] = $updateManager->getSiteDetail(); - $this->vars['installedItems'] = $updateManager->getInstalledItems(); - - return $this->makeView('browse/index'); - } - - public function search() - { - $json = []; - - if ($filter = input('filter') AND is_array($filter)) { - $itemType = $filter['type'] ?? 'extension'; - $searchQuery = isset($filter['search']) ? strtolower($filter['search']) : ''; - - try { - $json = UpdateManager::instance()->searchItems($itemType, $searchQuery); - } - catch (Exception $ex) { - $json = $ex->getMessage(); - } - } - - return $json; - } - protected function prepareAssets() { $this->addJs('ui/js/vendor/mustache.js', 'mustache-js'); $this->addJs('ui/js/vendor/typeahead.js', 'typeahead-js'); $this->addJs('ui/js/updates.js', 'updates-js'); } - - public function index_onCheckUpdates() - { - $updateManager = UpdateManager::instance(); - $updateManager->requestUpdateList(TRUE); - - return $this->redirect($this->checkUrl); - } - - public function index_onApplyCarte() - { - return $this->applyCarte(); - } - - public function index_onApply($context = null) - { - return $this->applyInstallOrUpdate($context); - } - - public function index_onIgnoreUpdate() - { - $items = post('items'); - if (!$items OR count($items) < 1) - throw new ApplicationException(lang('system::lang.updates.alert_item_to_ignore')); - - $updateManager = UpdateManager::instance(); - - $updateManager->ignoreUpdates($items); - - $updates = $updateManager->requestUpdateList(input('check') == 'force'); - - return [ - '#updates' => $this->makePartial('updates/list', ['updates' => $updates]), - ]; - } - - public function index_onProcess() - { - return $this->processInstallOrUpdate(); - } - - public function browse_onFetchItems() - { - $itemType = post('type'); - $items = UpdateManager::instance()->listItems($itemType); - - return [ - '#list-items' => $this->makePartial('browse/list', [ - 'items' => $items, - 'itemType' => $itemType, - ]), - ]; - } - - public function browse_onApplyCarte() - { - return $this->applyCarte(); - } - - public function browse_onApply($context = null) - { - return $this->applyInstallOrUpdate($context); - } - - public function browse_onProcess() - { - return $this->processInstallOrUpdate(); - } - - protected function applyCarte() - { - $carteKey = post('carte_key'); - if (!strlen($carteKey)) - throw new ApplicationException(lang('system::lang.updates.alert_no_carte_key')); - - $response = UpdateManager::instance()->applySiteDetail($carteKey); - - return [ - '#carte-details' => $this->makePartial('updates/carte_info', ['carteInfo' => $response]), - ]; - } - - protected function applyInstallOrUpdate($context) - { - $items = input('items') ?? []; - - if (!count($items)) - throw new ApplicationException(lang('system::lang.updates.alert_no_items')); - - $this->validateItems(); - - if ($context == 'index') { - $updates = UpdateManager::instance()->requestUpdateList(input('check') == 'force'); - $response['data'] = array_get($updates, 'items'); - } - else { - $response = UpdateManager::instance()->requestApplyItems($items); - } - - return [ - 'steps' => $this->buildProcessSteps($response, $items), - ]; - } - - protected function buildProcessSteps($meta, $params = []) - { - $processSteps = []; - if (!count($meta['data'])) - return $processSteps; - - foreach (['download', 'extract', 'complete'] as $step) { - // Silly way to sort the process - $applySteps = [ - 'core' => [], - 'extensions' => [], - 'themes' => [], - 'translations' => [], - ]; - - if ($step == 'complete') { - $processSteps[$step][] = [ - 'items' => $meta['data'], - 'process' => $step, - 'label' => lang("system::lang.updates.progress_{$step}"), - 'success' => sprintf(lang('system::lang.updates.progress_success'), rtrim($step, 'e').'ing', ''), - ]; - - continue; - } - - foreach (array_get($meta, 'data') as $item) { - if ($item['type'] == 'core') { - $applySteps['core'][] = array_merge([ - 'action' => 'update', - 'process' => "{$step}Core", - 'label' => sprintf(lang("system::lang.updates.progress_{$step}"), $item['name'].' update'), - 'success' => sprintf(lang('system::lang.updates.progress_success'), $step.'ing', $item['name']), - ], $item); - } - else { - $singularType = str_singular($item['type']); - $pluralType = str_plural($item['type']); - - $action = $this->getActionFromItems($item['code'], $params); - $applySteps[$pluralType][] = array_merge([ - 'action' => $action, - 'process' => $step.ucfirst($singularType), - 'label' => sprintf(lang("system::lang.updates.progress_{$step}"), "{$item['name']} {$singularType}"), - 'success' => sprintf(lang('system::lang.updates.progress_success'), $step.'ing', $item['name']), - ], $item); - } - } - - $processSteps[$step] = array_collapse(array_values($applySteps)); - } - - return $processSteps; - } - - protected function processInstallOrUpdate() - { - $json = []; - - $this->validateProcess(); - - $meta = post('meta'); - - $params = []; - if (post('step') != 'complete') { - $params = !isset($meta['code']) ? [] : [ - 'name' => $meta['code'], - 'type' => $meta['type'], - 'ver' => $meta['version'], - 'action' => $meta['action'], - ]; - } - - $updateManager = UpdateManager::instance(); - - $processMeta = $meta['process']; - switch ($processMeta) { - case 'downloadCore': - case 'downloadExtension': - case 'downloadTheme': - $result = $updateManager->downloadFile($meta['code'], $meta['hash'], $params); - if ($result) $json['result'] = 'success'; - break; - - case 'extractCore': - $response = $updateManager->extractCore($meta['code']); - if ($response) $json['result'] = 'success'; - break; - - case 'extractExtension': - $response = $updateManager->extractFile($meta['code'], extension_path('/')); - if ($response) $json['result'] = 'success'; - break; - case 'extractTheme': - $response = $updateManager->extractFile($meta['code'], theme_path('/')); - if ($response) $json['result'] = 'success'; - break; - - case 'complete': - $response = $this->completeProcess($meta['items']); - if ($response) $json['result'] = 'success'; - break; - } - - return $json; - } - - protected function completeProcess($items) - { - if (!count($items)) - return FALSE; - - $updateManager = UpdateManager::instance(); - - foreach ($items as $item) { - switch ($item['type']) { - case 'core': - $updateManager->update(); - $updateManager->setCoreVersion($item['version'], $item['hash']); - break; - case 'extension': - ExtensionManager::instance()->installExtension($item['code'], $item['version']); - break; - case 'theme': - ThemeManager::instance()->installTheme($item['code'], $item['version']); - break; - } - } - - return TRUE; - } - - protected function getActionFromItems($code, $itemNames) - { - foreach ($itemNames as $itemName) { - if ($code == $itemName['name']) - return $itemName['action']; - } - } - - protected function validateItems() - { - $rules = [ - ['items.*.name', 'lang:system::lang.updates.label_meta_code', 'required'], - ['items.*.type', 'lang:system::lang.updates.label_meta_type', 'required|in:extension,theme,language'], - ['items.*.ver', 'lang:system::lang.updates.label_meta_version', 'required'], - ['items.*.action', 'lang:system::lang.updates.label_meta_action', 'required|in:install,update'], - ]; - - return $this->validatePasses(post(), $rules); - } - - protected function validateProcess() - { - $rules = []; - if (post('step') != 'complete') { - $rules[] = ['meta.code', 'lang:system::lang.updates.label_meta_code', 'required']; - $rules[] = ['meta.type', 'lang:system::lang.updates.label_meta_type', 'required']; - $rules[] = ['meta.version', 'lang:system::lang.updates.label_meta_version', 'required']; - $rules[] = ['meta.hash', 'lang:system::lang.updates.label_meta_hash', 'required']; - $rules[] = ['meta.description', 'lang:system::lang.updates.label_meta_description', 'sometimes']; - $rules[] = ['meta.action', 'lang:system::lang.updates.label_meta_action', 'required|in:install,update']; - } - else { - $rules[] = ['meta.items', 'lang:system::lang.updates.label_meta_items', 'required|array']; - } - - $rules[] = ['step', 'lang:system::lang.updates.label_meta_step', 'required|in:download,extract,complete']; - - return $this->validatePasses(post(), $rules); - } } diff --git a/app/system/language/en/lang.php b/app/system/language/en/lang.php index 8511737b5e..6a7e5fd517 100644 --- a/app/system/language/en/lang.php +++ b/app/system/language/en/lang.php @@ -126,8 +126,7 @@ 'text_settings' => 'Settings', 'text_author' => 'Author', - 'button_browse' => '  Browse more extensions', - 'button_check' => '  Updates', + 'button_browse' => '  Browse more extensions  ', 'button_delete' => 'Delete', 'button_payments' => 'Manage Payments', 'button_settings' => 'Manage Settings', @@ -570,9 +569,8 @@ 'label_type_layout' => 'Layouts', 'label_type_content' => 'Contents', - 'button_browse' => '  Browse more themes', + 'button_browse' => '  Browse more themes  ', 'button_source' => '  Edit template files', - 'button_check' => '  Updates', 'button_customize' => '  Customize', 'button_child' => '  Create child theme', 'button_choose' => 'Choose', @@ -605,7 +603,7 @@ 'text_tab_title_extensions' => 'Extensions', 'text_tab_title_themes' => 'Themes', 'text_ignore' => 'Ignore', - 'text_search' => 'Search the marketplace for %s to install', + 'text_search' => 'Search the TastyIgniter marketplace for %s to install', 'text_popular_title' => 'Recommended %s', 'text_last_checked' => 'Last checked: %s', @@ -636,13 +634,15 @@ 'progress_disable_maintenance' => 'Restoring/Disabling Maintenance mode…', 'button_browse' => '  Browse %s', - 'button_carte' => '  Carté', - 'button_check' => '  Check Again', + 'button_carte' => '  Attach Carté Key', + 'button_check' => '  Check Updates', 'button_updates' => '  Updates', 'button_update' => '  Update', - 'button_marketplace' => 'Open TastyIgniter Marketplace  ', + 'button_recommended_extension' => 'Install recommended extensions...', + 'button_recommended_theme' => 'Install a recommended theme...', + 'button_install' => 'Install Selected...', - 'help_carte_key' => 'A Carte key is required to add and update item from the TastyIgniter Marketplace. Get one by creating a site from your TastyIgniter Account, if you haven\'t already. For more information, see the Carté Key Guide', + 'help_carte_key' => 'A Carte key is required to add and update item from the TastyIgniter Marketplace.
Get one by creating a site from your TastyIgniter Account, if you haven\'t already. For more information, see the Carté Key Guide', 'alert_item_to_ignore' => 'Select item(s) to ignore.', 'alert_no_carte_key' => 'No carte key specified.', 'alert_no_items' => 'No item(s) specified.', diff --git a/app/system/models/config/extensions_model.php b/app/system/models/config/extensions_model.php index 0a156c8e2a..d6e1a9f7e5 100644 --- a/app/system/models/config/extensions_model.php +++ b/app/system/models/config/extensions_model.php @@ -11,16 +11,17 @@ 'browse' => [ 'label' => 'lang:system::lang.extensions.button_browse', 'class' => 'btn btn-primary', - 'href' => 'updates/browse/extensions', + 'href' => 'https://tastyigniter.com/marketplace', + 'target' => '_blank', ], 'check' => [ - 'label' => 'lang:system::lang.extensions.button_check', + 'label' => 'lang:system::lang.updates.button_check', 'class' => 'btn btn-success', 'href' => 'updates', ], 'filter' => [ 'label' => 'lang:admin::lang.button_icon_filter', - 'class' => 'btn btn-default btn-filter', + 'class' => 'btn btn-default btn-filter pull-right', 'data-toggle' => 'list-filter', 'data-target' => '.list-filter', ], diff --git a/app/system/models/config/themes_model.php b/app/system/models/config/themes_model.php index 68fff0a573..82855f779a 100644 --- a/app/system/models/config/themes_model.php +++ b/app/system/models/config/themes_model.php @@ -4,10 +4,11 @@ 'browse' => [ 'label' => 'lang:system::lang.themes.button_browse', 'class' => 'btn btn-primary', - 'href' => 'updates/browse/themes', + 'href' => 'https://tastyigniter.com/marketplace', + 'target' => '_blank', ], 'check' => [ - 'label' => 'lang:system::lang.themes.button_check', + 'label' => 'lang:system::lang.updates.button_check', 'class' => 'btn btn-success', 'href' => 'updates', ], diff --git a/app/system/traits/ManagesUpdates.php b/app/system/traits/ManagesUpdates.php new file mode 100644 index 0000000000..9ac98bd4b0 --- /dev/null +++ b/app/system/traits/ManagesUpdates.php @@ -0,0 +1,308 @@ +searchItems($itemType, $searchQuery); + } + catch (Exception $ex) { + $json = $ex->getMessage(); + } + } + + return $json; + } + + public function onApplyItems() + { + $items = post('items') ?? []; + $itemsCodes = post('install_items') ?? []; + if (!count($items) OR !count($itemsCodes)) + throw new ApplicationException(lang('system::lang.updates.alert_no_items')); + + $this->validateItems(); + + $items = collect($items)->whereIn('name', $itemsCodes)->all(); + + $response = UpdateManager::instance()->requestApplyItems($items); + $response = array_get($response, 'data', []); + + return [ + 'steps' => $this->buildProcessSteps($response, $items), + ]; + } + + public function onApplyUpdate() + { + $items = post('items') ?? []; + if (!count($items)) + throw new ApplicationException(lang('system::lang.updates.alert_no_items')); + + $this->validateItems(); + + $updates = UpdateManager::instance()->requestUpdateList(input('check') == 'force'); + $response = array_get($updates, 'items'); + + return [ + 'steps' => $this->buildProcessSteps($response, $items), + ]; + } + + public function onLoadRecommended() + { + $itemType = post('itemType'); + $items = (in_array($itemType, ['theme', 'extension'])) + ? UpdateManager::instance()->listItems($itemType) + : []; + + return $this->makePartial('updates/list_recommended', [ + 'items' => $items, + 'itemType' => $itemType, + ]); + } + + public function onCheckUpdates() + { + $updateManager = UpdateManager::instance(); + $updateManager->requestUpdateList(TRUE); + + return $this->redirect($this->checkUrl); + } + + public function onIgnoreUpdate() + { + $items = post('items'); + if (!$items OR count($items) < 1) + throw new ApplicationException(lang('system::lang.updates.alert_item_to_ignore')); + + $updateManager = UpdateManager::instance(); + + $updateManager->ignoreUpdates($items); + + $updates = $updateManager->requestUpdateList(input('check') == 'force'); + + return [ + '#updates' => $this->makePartial('updates/list', ['updates' => $updates]), + ]; + } + + public function onApplyCarte() + { + $carteKey = post('carte_key'); + if (!strlen($carteKey)) + throw new ApplicationException(lang('system::lang.updates.alert_no_carte_key')); + + $response = UpdateManager::instance()->applySiteDetail($carteKey); + + return [ + '#carte-details' => $this->makePartial('updates/carte_info', ['carteInfo' => $response]), + ]; + } + + public function onProcessItems() + { + return $this->processInstallOrUpdate(); + } + + // + // + // + + protected function initUpdate($itemType) + { + $this->addJs('ui/js/vendor/mustache.js', 'mustache-js'); + $this->addJs('ui/js/vendor/typeahead.js', 'typeahead-js'); + $this->addJs('ui/js/updates.js', 'updates-js'); + $this->addJs('~/app/admin/formwidgets/recordeditor/assets/js/recordeditor.modal.js', 'recordeditor-modal-js'); + + $updateManager = UpdateManager::instance(); + + $this->vars['itemType'] = $itemType; + $this->vars['carteInfo'] = $updateManager->getSiteDetail(); + $this->vars['installedItems'] = $updateManager->getInstalledItems(); + } + + protected function buildProcessSteps($response, $params = []) + { + $processSteps = []; + foreach (['download', 'extract', 'complete'] as $step) { + // Silly way to sort the process + $applySteps = [ + 'core' => [], + 'extensions' => [], + 'themes' => [], + 'translations' => [], + ]; + + if ($step == 'complete') { + $processSteps[$step][] = [ + 'items' => $response, + 'process' => $step, + 'label' => lang("system::lang.updates.progress_{$step}"), + 'success' => sprintf(lang('system::lang.updates.progress_success'), rtrim($step, 'e').'ing', ''), + ]; + + continue; + } + + foreach ($response as $item) { + if ($item['type'] == 'core') { + $applySteps['core'][] = array_merge([ + 'action' => 'update', + 'process' => "{$step}Core", + 'label' => sprintf(lang("system::lang.updates.progress_{$step}"), $item['name'].' update'), + 'success' => sprintf(lang('system::lang.updates.progress_success'), $step.'ing', $item['name']), + ], $item); + } + else { + $singularType = str_singular($item['type']); + $pluralType = str_plural($item['type']); + + $action = $this->getActionFromItems($item['code'], $params); + $applySteps[$pluralType][] = array_merge([ + 'action' => $action ?? 'install', + 'process' => $step.ucfirst($singularType), + 'label' => sprintf(lang("system::lang.updates.progress_{$step}"), "{$item['name']} {$singularType}"), + 'success' => sprintf(lang('system::lang.updates.progress_success'), $step.'ing', $item['name']), + ], $item); + } + } + + $processSteps[$step] = array_collapse(array_values($applySteps)); + } + + return $processSteps; + } + + protected function processInstallOrUpdate() + { + $json = []; + + $this->validateProcess(); + + $meta = post('meta'); + + $params = []; + if (post('step') != 'complete') { + $params = !isset($meta['code']) ? [] : [ + 'name' => $meta['code'], + 'type' => $meta['type'], + 'ver' => $meta['version'], + 'action' => $meta['action'], + ]; + } + + $updateManager = UpdateManager::instance(); + + $processMeta = $meta['process']; + switch ($processMeta) { + case 'downloadCore': + case 'downloadExtension': + case 'downloadTheme': + $result = $updateManager->downloadFile($meta['code'], $meta['hash'], $params); + if ($result) $json['result'] = 'success'; + break; + + case 'extractCore': + $response = $updateManager->extractCore($meta['code']); + if ($response) $json['result'] = 'success'; + break; + + case 'extractExtension': + $response = $updateManager->extractFile($meta['code'], extension_path('/')); + if ($response) $json['result'] = 'success'; + break; + case 'extractTheme': + $response = $updateManager->extractFile($meta['code'], theme_path('/')); + if ($response) $json['result'] = 'success'; + break; + + case 'complete': + $response = $this->completeProcess($meta['items']); + if ($response) $json['result'] = 'success'; + break; + } + + return $json; + } + + protected function completeProcess($items) + { + if (!count($items)) + return FALSE; + + foreach ($items as $item) { + switch ($item['type']) { + case 'core': + $updateManager = UpdateManager::instance(); + $updateManager->update(); + $updateManager->setCoreVersion($item['version'], $item['hash']); + break; + case 'extension': + ExtensionManager::instance()->installExtension($item['code'], $item['version']); + break; + case 'theme': + ThemeManager::instance()->installTheme($item['code'], $item['version']); + break; + } + } + + return TRUE; + } + + protected function getActionFromItems($code, $itemNames) + { + foreach ($itemNames as $itemName) { + if ($code == $itemName['name']) + return $itemName['action']; + } + } + + protected function validateItems() + { + $rules = [ + ['items.*.name', 'lang:system::lang.updates.label_meta_code', 'required'], + ['items.*.type', 'lang:system::lang.updates.label_meta_type', 'required|in:extension,theme,language'], + ['items.*.ver', 'lang:system::lang.updates.label_meta_version', 'required'], + ['items.*.action', 'lang:system::lang.updates.label_meta_action', 'required|in:install,update'], + ]; + + return $this->validate(post(), $rules); + } + + protected function validateProcess() + { + $rules = []; + if (post('step') != 'complete') { + $rules[] = ['meta.code', 'lang:system::lang.updates.label_meta_code', 'required']; + $rules[] = ['meta.type', 'lang:system::lang.updates.label_meta_type', 'required']; + $rules[] = ['meta.version', 'lang:system::lang.updates.label_meta_version', 'required']; + $rules[] = ['meta.hash', 'lang:system::lang.updates.label_meta_hash', 'required']; + $rules[] = ['meta.description', 'lang:system::lang.updates.label_meta_description', 'sometimes']; + $rules[] = ['meta.action', 'lang:system::lang.updates.label_meta_action', 'required|in:install,update']; + } + else { + $rules[] = ['meta.items', 'lang:system::lang.updates.label_meta_items', 'required|array']; + } + + $rules[] = ['step', 'lang:system::lang.updates.label_meta_step', 'required|in:download,extract,complete']; + + return $this->validate(post(), $rules); + } +} diff --git a/app/system/views/extensions/index.blade.php b/app/system/views/extensions/index.blade.php index 998ed6303e..fa884621c4 100644 --- a/app/system/views/extensions/index.blade.php +++ b/app/system/views/extensions/index.blade.php @@ -1,4 +1,9 @@
- {!! $this->renderList() !!} -
+ {!! $this->widgets['toolbar']->render() !!} + + {!! $this->makePartial('updates/search', ['itemType' => 'extension']) !!} + {!! $this->widgets['list_filter']->render() !!} + + {!! $this->widgets['list']->render() !!} +
diff --git a/app/system/views/extensions/lists/list.blade.php b/app/system/views/extensions/lists/list.blade.php index 8e0ac0a332..6b2f452b8b 100644 --- a/app/system/views/extensions/lists/list.blade.php +++ b/app/system/views/extensions/lists/list.blade.php @@ -6,7 +6,7 @@ ] ) !!} -
+
@if (count($records)) {!! $this->makePartial('lists/list_body') !!} @else @@ -19,3 +19,5 @@ {!! form_close() !!} {!! $this->makePartial('lists/list_pagination') !!} + +{!! $this->makePartial('updates/recommended', ['itemType' => 'extension']) !!} diff --git a/app/system/views/themes/index.blade.php b/app/system/views/themes/index.blade.php index 5dbd03bd48..9c815a3266 100644 --- a/app/system/views/themes/index.blade.php +++ b/app/system/views/themes/index.blade.php @@ -1,3 +1,7 @@
- {!! $this->renderList() !!} + {!! $this->widgets['toolbar']->render() !!} + + {!! $this->makePartial('updates/search', ['itemType' => 'theme']) !!} + + {!! $this->widgets['list']->render() !!}
diff --git a/app/system/views/themes/lists/list.blade.php b/app/system/views/themes/lists/list.blade.php index 4a79139434..3fdb990663 100644 --- a/app/system/views/themes/lists/list.blade.php +++ b/app/system/views/themes/lists/list.blade.php @@ -14,4 +14,6 @@ {!! form_close() !!} {!! $this->makePartial('lists/list_pagination') !!} + + {!! $this->makePartial('updates/recommended', ['itemType' => 'theme']) !!}
diff --git a/app/system/views/updates/browse/extension.blade.php b/app/system/views/updates/browse/extension.blade.php deleted file mode 100644 index 032b363693..0000000000 --- a/app/system/views/updates/browse/extension.blade.php +++ /dev/null @@ -1,35 +0,0 @@ - -
-
-
- @if (!empty($item['thumb'])) - No Image - @else - - @endif -
-
- {{ str_limit($item['name'], 22) }} -

{{ str_limit($item['description'], 128) }}

-
-
-
- diff --git a/app/system/views/updates/browse/index.blade.php b/app/system/views/updates/browse/index.blade.php deleted file mode 100644 index f22c0d33cc..0000000000 --- a/app/system/views/updates/browse/index.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -
- - {!! $this->widgets['toolbar']->render() !!} - - {!! $this->makePartial('updates/search') !!} - -
-
-
{{ sprintf(lang('system::lang.updates.text_popular_title'), ucwords(str_plural($itemType))) }}
-
- -
-

- -

-
-
-
- -{!! $this->makePartial('updates/carte') !!} diff --git a/app/system/views/updates/browse/list.blade.php b/app/system/views/updates/browse/list.blade.php deleted file mode 100644 index b1e73906ba..0000000000 --- a/app/system/views/updates/browse/list.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@if (isset($items) AND count($items)) -
- @foreach ($items['data'] as $item) -
- {!! $this->makePartial('updates/browse/'.$itemType, ['item' => $item]) !!} -
- @endforeach -
-@endif diff --git a/app/system/views/updates/browse/theme.blade.php b/app/system/views/updates/browse/theme.blade.php deleted file mode 100644 index f43ec26d53..0000000000 --- a/app/system/views/updates/browse/theme.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -
- No Image -
- {{ str_limit($item['name'], 22) }} -

{{ str_limit($item['description'], 72) }}

-
-
- @if (!empty($item['installed'])) - - @else - - @endif -
-
diff --git a/app/system/views/updates/list_recommended.blade.php b/app/system/views/updates/list_recommended.blade.php new file mode 100644 index 0000000000..e9eab94d82 --- /dev/null +++ b/app/system/views/updates/list_recommended.blade.php @@ -0,0 +1,63 @@ +
+ {!! form_open([ + 'id' => 'list-recommended-form', + 'role' => 'form', + 'method' => 'PATCH', + ]) !!} +
+
+

{{ sprintf(lang('system::lang.updates.text_popular_title'), ucwords(str_plural($itemType))) }}

+ +
+
+ @if (isset($items) AND count($items)) + @foreach ($items['data'] as $index => $item) +
+
+
+ +
+
+ {{ $item['name'] }} by {{ $item['author'] }} + {{ str_limit($item['description'], 128) }} +
+
+ first) ? 'checked="checked"' : '' }} + {!! empty($item['installed']) ? '' : 'disabled="disabled"' !!} + /> + +
+
+ + + + +
+ @endforeach + @endif +
+
+ +
+
+ {!! form_close() !!} +
diff --git a/app/system/views/updates/recommended.blade.php b/app/system/views/updates/recommended.blade.php new file mode 100644 index 0000000000..c964f6664b --- /dev/null +++ b/app/system/views/updates/recommended.blade.php @@ -0,0 +1,16 @@ +
+
+ +
{!! sprintf(lang('system::lang.updates.help_carte_key'), 'https://tastyigniter.com/signin', 'https://tastyigniter.com/support/articles/carte-key') !!} +
+
+
diff --git a/app/system/views/updates/search.blade.php b/app/system/views/updates/search.blade.php index 38ed9b6496..5387bad94c 100644 --- a/app/system/views/updates/search.blade.php +++ b/app/system/views/updates/search.blade.php @@ -1,25 +1,14 @@ -
-
-
- -
- @lang('system::lang.updates.button_marketplace') -
-
+
+
From a64fa56f44850d3715d259dbcc52d2dd61f813be Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 25 Sep 2021 09:14:39 +0100 Subject: [PATCH 10/24] Disable combine assets when app.debug is true --- app/system/traits/CombinesAssets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/traits/CombinesAssets.php b/app/system/traits/CombinesAssets.php index 31f9da509a..02f9be855b 100644 --- a/app/system/traits/CombinesAssets.php +++ b/app/system/traits/CombinesAssets.php @@ -57,7 +57,7 @@ protected function initCombiner() $this->cacheKeyPrefix = 'ti.combiner.'; $this->useCache = config('system.enableAssetCache', TRUE); $this->useMinify = config('system.enableAssetMinify', null); - $this->combineAssets = config('system.enableAssetCombiner', !config('app.debug', FALSE)); + $this->combineAssets = config('app.debug', FALSE) ? FALSE : config('system.enableAssetCombiner', TRUE); $this->storagePath = storage_path('system/combiner/data'); $this->assetsCombinerUri = config('system.assetsCombinerUri', '/_assets'); From 678b9b370da7cea84f1c134f53d2554d51e5ac9f Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 25 Sep 2021 09:16:11 +0100 Subject: [PATCH 11/24] Only active themes can be customized --- app/system/controllers/Themes.php | 15 +++++++++++---- app/system/language/en/lang.php | 1 + 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/system/controllers/Themes.php b/app/system/controllers/Themes.php index fd9ecdfcc9..ce406ec468 100644 --- a/app/system/controllers/Themes.php +++ b/app/system/controllers/Themes.php @@ -6,6 +6,7 @@ use Admin\Facades\Template; use Admin\Traits\WidgetMaker; use Exception; +use Igniter\Flame\Exception\ApplicationException; use Igniter\Flame\Support\Facades\File; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Event; @@ -80,6 +81,9 @@ public function index() public function edit($context, $themeCode = null) { + if (!ThemeManager::instance()->isActive($themeCode)) + throw new ApplicationException(lang('system::lang.themes.alert_customize_not_active')); + if (ThemeManager::instance()->isLocked($themeCode)) { Template::setButton(lang('system::lang.themes.button_child'), [ 'class' => 'btn btn-default pull-right', @@ -104,10 +108,13 @@ public function source($context, $themeCode = null) ]); } - Template::setButton(lang('system::lang.themes.button_customize'), [ - 'class' => 'btn btn-default pull-right mr-3', - 'href' => admin_url('themes/edit/'.$themeCode), - ]); + $theme = ThemeManager::instance()->findTheme($themeCode); + if ($theme AND $theme->hasCustomData()) { + Template::setButton(lang('system::lang.themes.button_customize'), [ + 'class' => 'btn btn-default pull-right mr-3', + 'href' => admin_url('themes/edit/'.$themeCode), + ]); + } $this->asExtension('FormController')->edit($context, $themeCode); } diff --git a/app/system/language/en/lang.php b/app/system/language/en/lang.php index 6a7e5fd517..558b8ba9a3 100644 --- a/app/system/language/en/lang.php +++ b/app/system/language/en/lang.php @@ -592,6 +592,7 @@ 'alert_theme_locked' => 'This is a locked theme, changes are restricted, create a child theme to make changes.', 'alert_theme_path_locked' => 'This template belongs to a locked theme, such actions are restricted.', 'alert_changes_confirm' => 'Conflicting versions, template file has changed. Reload the page to continue.', + 'alert_customize_not_active' => 'You can only customize an active theme.', ], 'updates' => [ From 676e1811918526fce5883d08600b5cd11b9a4bd1 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 25 Sep 2021 09:17:48 +0100 Subject: [PATCH 12/24] Ensure admin username and email doesn't already exists on igniter:install --- app/admin/classes/User.php | 10 ++-- .../console/commands/IgniterInstall.php | 51 +++++++++++-------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/app/admin/classes/User.php b/app/admin/classes/User.php index 8fff170f1c..18bcbf33b2 100644 --- a/app/admin/classes/User.php +++ b/app/admin/classes/User.php @@ -87,7 +87,7 @@ public function register(array $attributes, $activate = FALSE) { $model = $this->createModel(); - $staff = $model->staff()->newInstance(); + $staff = $model->staff()->getModel()->newInstance(); $staff->staff_email = $attributes['staff_email']; $staff->staff_name = $attributes['staff_name']; $staff->language_id = $attributes['language_id'] ?? null; @@ -102,9 +102,11 @@ public function register(array $attributes, $activate = FALSE) $staff->save(); - if ($staff->groups->isEmpty()) - $staff->groups()->attach($attributes['groups']); + $staff->groups()->attach($attributes['groups']); - return $model; + if (array_key_exists('locations', $attributes)) + $staff->locations()->attach($attributes['locations']); + + return $staff->reload()->user; } } diff --git a/app/system/console/commands/IgniterInstall.php b/app/system/console/commands/IgniterInstall.php index 0d3b2b5559..65373042ea 100644 --- a/app/system/console/commands/IgniterInstall.php +++ b/app/system/console/commands/IgniterInstall.php @@ -2,13 +2,13 @@ namespace System\Console\Commands; +use Admin\Facades\AdminAuth; use Admin\Models\Customer_groups_model; use Admin\Models\Locations_model; use Admin\Models\Staff_groups_model; use Admin\Models\Staff_roles_model; use Admin\Models\Staffs_model; use Admin\Models\Users_model; -use Carbon\Carbon; use Igniter\Flame\Support\ConfigRewrite; use Illuminate\Console\Command; use Illuminate\Support\Facades\App; @@ -149,7 +149,22 @@ protected function setSeederProperties() protected function createSuperUser() { - $username = $this->ask('Admin Username', 'admin'); + $email = $this->output->ask('Admin Email', DatabaseSeeder::$siteEmail, function ($answer) { + if (Staffs_model::whereStaffEmail($answer)->first()) { + throw new \RuntimeException('An administrator with that email already exists, please choose a different email.'); + } + + return $answer; + }); + + $username = $this->output->ask('Admin Username', 'admin', function ($answer) { + if (Users_model::whereUsername($answer)->first()) { + throw new \RuntimeException('An administrator with that username already exists, please choose a different username.'); + } + + return $answer; + }); + $password = $this->output->ask('Admin Password', '123456', function ($answer) { if (!is_string($answer) OR strlen($answer) < 6) { throw new \RuntimeException('Please specify the administrator password, at least 6 characters'); @@ -158,25 +173,19 @@ protected function createSuperUser() return $answer; }); - $staff = Staffs_model::firstOrNew(['staff_email' => DatabaseSeeder::$siteEmail]); - $staff->staff_name = DatabaseSeeder::$staffName; - $staff->staff_role_id = Staff_roles_model::first()->staff_role_id; - $staff->language_id = Languages_model::first()->language_id; - $staff->staff_status = TRUE; - $staff->save(); - - $staff->groups()->attach(Staff_groups_model::first()->staff_group_id); - $staff->locations()->attach(Locations_model::first()->location_id); - - $user = Users_model::firstOrNew(['username' => $username]); - $user->staff_id = $staff->staff_id; - $user->password = $password; - $user->super_user = TRUE; - $user->is_activated = TRUE; - $user->date_activated = Carbon::now(); - $user->save(); - - $this->line('Admin user '.$username.' created!'); + $user = AdminAuth::register([ + 'staff_email' => $email, + 'staff_name' => DatabaseSeeder::$staffName, + 'language_id' => Languages_model::first()->language_id, + 'staff_role_id' => Staff_roles_model::first()->staff_role_id, + 'staff_status' => TRUE, + 'username' => $username, + 'password' => $password, + 'groups' => [Staff_groups_model::first()->staff_group_id], + 'locations' => [Locations_model::first()->location_id], + ]); + + $this->line('Admin user '.$user->username.' created!'); } protected function addSystemValues() From 507b802c50f493f8f1739d6b4f9e09913c161042 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Sat, 25 Sep 2021 09:19:02 +0100 Subject: [PATCH 13/24] Add igniter.passwd command to change admin user password --- app/system/ServiceProvider.php | 1 + .../console/commands/IgniterInstall.php | 3 + app/system/console/commands/IgniterPasswd.php | 101 ++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 app/system/console/commands/IgniterPasswd.php diff --git a/app/system/ServiceProvider.php b/app/system/ServiceProvider.php index 1dbbfed710..1ca0f94e64 100644 --- a/app/system/ServiceProvider.php +++ b/app/system/ServiceProvider.php @@ -189,6 +189,7 @@ protected function registerConsole() 'igniter.down' => Console\Commands\IgniterDown::class, 'igniter.install' => Console\Commands\IgniterInstall::class, 'igniter.update' => Console\Commands\IgniterUpdate::class, + 'igniter.passwd' => Console\Commands\IgniterPasswd::class, 'extension.install' => Console\Commands\ExtensionInstall::class, 'extension.refresh' => Console\Commands\ExtensionRefresh::class, 'extension.remove' => Console\Commands\ExtensionRemove::class, diff --git a/app/system/console/commands/IgniterInstall.php b/app/system/console/commands/IgniterInstall.php index 65373042ea..aa12f77f77 100644 --- a/app/system/console/commands/IgniterInstall.php +++ b/app/system/console/commands/IgniterInstall.php @@ -98,6 +98,9 @@ protected function getOptions() protected function rewriteEnvFile() { + if (file_exists(base_path().'/.env') AND !$this->confirm('Rewrite environment file?', FALSE)) + return; + $this->moveExampleFile('env', null, 'backup'); $this->copyExampleFile('env', 'example', null); diff --git a/app/system/console/commands/IgniterPasswd.php b/app/system/console/commands/IgniterPasswd.php new file mode 100644 index 0000000000..1f509fc528 --- /dev/null +++ b/app/system/console/commands/IgniterPasswd.php @@ -0,0 +1,101 @@ +argument('username') + ?? $this->ask('Username to reset'); + + $user = Users_model::whereUsername($username)->first() + ?? Staffs_model::whereStaffEmail($username)->first(); + if (!$user) + throw new ApplicationException('The specified user does not exist.'); + + if (is_null($password = $this->argument('password'))) { + $password = $this->optionalSecret('Enter new password (leave blank for generated password)') + ?: $this->generatePassword(); + } + + $user->password = $password; + $user->save(); + + $this->info('Password successfully changed.'); + if ($this->generatedPassword) { + $this->output->writeLn('Password set to '.$password.'.'); + } + } + + /** + * Get the console command options. + */ + protected function getArguments() + { + return [ + ['username', InputArgument::OPTIONAL, 'The username of the Backend user'], + ['password', InputArgument::OPTIONAL, 'The new password'], + ]; + } + + /** + * Prompt the user for input but hide the answer from the console. + * + * Also allows for a default to be specified. + * + * @param string $question + * @param bool $fallback + * @return string + */ + protected function optionalSecret($question) + { + $question = new Question($question, FALSE); + + $question->setHidden(TRUE)->setHiddenFallback(FALSE); + + return $this->output->askQuestion($question); + } + + /** + * Generate a password and flag it as an automatically-generated password. + * + * @return string + */ + protected function generatePassword() + { + $this->generatedPassword = TRUE; + + return str_random(22); + } +} From 7dfc03290195c5f7e586cfbce150647655e0e316 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Mon, 27 Sep 2021 23:25:25 +0100 Subject: [PATCH 14/24] Fix broken list delete record button --- app/admin/widgets/lists/assets/js/lists.js | 3 +++ app/admin/widgets/lists/list.blade.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/admin/widgets/lists/assets/js/lists.js b/app/admin/widgets/lists/assets/js/lists.js index b414e509d6..519676f06c 100644 --- a/app/admin/widgets/lists/assets/js/lists.js +++ b/app/admin/widgets/lists/assets/js/lists.js @@ -45,6 +45,9 @@ $(function ($) { $bulkActionsContainer = $('[data-control="bulk-actions"]'), $selectAllRecordsButton = $('[data-control="check-total-records"]') + if (!$bulkActionsContainer.length) + return; + $(document).on('change', '.list-table input[name*=checked]', function (event) { onChangeListCheckboxes($(this)) }) diff --git a/app/admin/widgets/lists/list.blade.php b/app/admin/widgets/lists/list.blade.php index e0a6444a65..a2a5012fa8 100644 --- a/app/admin/widgets/lists/list.blade.php +++ b/app/admin/widgets/lists/list.blade.php @@ -1,5 +1,5 @@ {!! form_open([ - 'id' => $this->getId('form'), + 'id' => 'list-form', 'role' => 'form', 'method' => 'POST', ]) !!} From 4b82f5ea9acd58b1d8679a39ebd951c6ac109be8 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Tue, 28 Sep 2021 09:06:54 +0100 Subject: [PATCH 15/24] Apply fixes from StyleCI (#869) [ci skip] [skip ci] Co-authored-by: Sam Poyigi --- app/system/controllers/Extensions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/controllers/Extensions.php b/app/system/controllers/Extensions.php index 5ed48a1897..93316cfade 100644 --- a/app/system/controllers/Extensions.php +++ b/app/system/controllers/Extensions.php @@ -9,10 +9,10 @@ use Igniter\Flame\Exception\ApplicationException; use Igniter\Flame\Exception\SystemException; use Illuminate\Support\Facades\Request; -use System\Traits\ManagesUpdates; use System\Classes\ExtensionManager; use System\Models\Extensions_model; use System\Models\Settings_model; +use System\Traits\ManagesUpdates; class Extensions extends \Admin\Classes\AdminController { From 2df93f7b4953e16bc3bc2cd2b05d1be7a6c9e21c Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Mon, 4 Oct 2021 08:14:57 +0100 Subject: [PATCH 16/24] Remove currency middleware so that the configured default currency can be used Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/ServiceProvider.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/system/ServiceProvider.php b/app/system/ServiceProvider.php index 1ca0f94e64..c261e4d3a7 100644 --- a/app/system/ServiceProvider.php +++ b/app/system/ServiceProvider.php @@ -97,8 +97,6 @@ public function boot() $this->extendValidator(); $this->addTranslationDriver(); $this->defineQueryMacro(); - - $this->app['router']->pushMiddlewareToGroup('web', 'currency'); } /* From 9a3a1ef47c6b1989a5175bf9f5902f76ff3b1be3 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Mon, 4 Oct 2021 08:20:26 +0100 Subject: [PATCH 17/24] Minor fix Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- .../assets/scss/components/_marketplace.scss | 4 +- .../models/config/staff_groups_model.php | 42 ------------------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/app/admin/assets/scss/components/_marketplace.scss b/app/admin/assets/scss/components/_marketplace.scss index 96be69721c..de353c286a 100644 --- a/app/admin/assets/scss/components/_marketplace.scss +++ b/app/admin/assets/scss/components/_marketplace.scss @@ -33,7 +33,7 @@ } .fa-icon { - top: 12px; + top: 15px; right: 15px; position: absolute; } @@ -126,4 +126,4 @@ .card.disabled { background-color: $gray-300; } -} \ No newline at end of file +} diff --git a/app/admin/models/config/staff_groups_model.php b/app/admin/models/config/staff_groups_model.php index 7a0035e555..ace0483d20 100644 --- a/app/admin/models/config/staff_groups_model.php +++ b/app/admin/models/config/staff_groups_model.php @@ -141,48 +141,6 @@ 'condition' => 'checked', ], ], - 'auto_assign' => [ - 'label' => 'lang:admin::lang.staff_groups.label_auto_assign', - 'type' => 'switch', - 'comment' => 'lang:admin::lang.staff_groups.help_auto_assign', - ], - 'auto_assign_mode' => [ - 'label' => 'lang:admin::lang.staff_groups.label_assignment_mode', - 'type' => 'radiolist', - 'span' => 'left', - 'default' => 1, - 'options' => [ - 1 => ['admin::lang.staff_groups.text_round_robin', 'admin::lang.staff_groups.help_round_robin'], - 2 => ['admin::lang.staff_groups.text_load_balanced', 'admin::lang.staff_groups.help_load_balanced'], - ], - 'trigger' => [ - 'action' => 'show', - 'field' => 'auto_assign', - 'condition' => 'checked', - ], - ], - 'auto_assign_limit' => [ - 'label' => 'lang:admin::lang.staff_groups.label_load_balanced_limit', - 'type' => 'number', - 'default' => 20, - 'comment' => 'lang:admin::lang.staff_groups.help_load_balanced_limit', - 'trigger' => [ - 'action' => 'show', - 'field' => 'auto_assign', - 'condition' => 'checked', - ], - ], - 'auto_assign_availability' => [ - 'label' => 'lang:admin::lang.staff_groups.label_assignment_availability', - 'type' => 'switch', - 'default' => TRUE, - 'comment' => 'lang:admin::lang.staff_groups.help_assignment_availability', - 'trigger' => [ - 'action' => 'show', - 'field' => 'auto_assign', - 'condition' => 'checked', - ], - ], ]; return $config; From bd173e7411a5b28cee0d7f8856ba52ce045d2a18 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Mon, 4 Oct 2021 08:20:50 +0100 Subject: [PATCH 18/24] Add isConfigured method to SettingsModel Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/actions/SettingsModel.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/system/actions/SettingsModel.php b/app/system/actions/SettingsModel.php index b11e6bccf5..3370bf005c 100644 --- a/app/system/actions/SettingsModel.php +++ b/app/system/actions/SettingsModel.php @@ -88,6 +88,15 @@ public function resetDefault() } } + /** + * Checks if the model has been set up previously, intended as a static method + * @return bool + */ + public function isConfigured() + { + return app()->hasDatabase() && $this->getSettingsRecord() !== null; + } + /** * Returns the raw Model record that stores the settings. * @return Model From d1a41d48e5ff4c53671382262ce10485b7afe012 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Mon, 4 Oct 2021 09:16:38 +0100 Subject: [PATCH 19/24] Minor fix Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/classes/UpdateManager.php | 14 ++++++++------ app/system/traits/ManagesUpdates.php | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/system/classes/UpdateManager.php b/app/system/classes/UpdateManager.php index 615bbc5aeb..de1c0e2388 100644 --- a/app/system/classes/UpdateManager.php +++ b/app/system/classes/UpdateManager.php @@ -362,9 +362,8 @@ public function requestUpdateList($force = FALSE) $installedItems = collect($installedItems)->keyBy('name')->all(); - $coreUpdate = collect(array_get($updates, 'data', []))->firstWhere('type', 'core'); - $updateCount = 0; + $hasCoreUpdate = FALSE; foreach (array_get($updates, 'data', []) as $update) { $updateCount++; $update['installedVer'] = array_get(array_get($installedItems, $update['code'], []), 'ver'); @@ -375,11 +374,14 @@ public function requestUpdateList($force = FALSE) $update['installedVer'] = params('ti_version'); if ($this->disableCoreUpdates) continue; - } - if ((array_get($update, 'type') !== 'core' AND $coreUpdate) OR $this->isMarkedAsIgnored($update['code'])) { - $ignoredItems[] = $update; - continue; + $hasCoreUpdate = TRUE; + } + else { + if ($hasCoreUpdate OR $this->isMarkedAsIgnored($update['code'])) { + $ignoredItems[] = $update; + continue; + } } $update['icon'] = generate_extension_icon($update['icon'] ?? []); diff --git a/app/system/traits/ManagesUpdates.php b/app/system/traits/ManagesUpdates.php index 9ac98bd4b0..817dab59e9 100644 --- a/app/system/traits/ManagesUpdates.php +++ b/app/system/traits/ManagesUpdates.php @@ -278,7 +278,7 @@ protected function validateItems() { $rules = [ ['items.*.name', 'lang:system::lang.updates.label_meta_code', 'required'], - ['items.*.type', 'lang:system::lang.updates.label_meta_type', 'required|in:extension,theme,language'], + ['items.*.type', 'lang:system::lang.updates.label_meta_type', 'required|in:core,extension,theme'], ['items.*.ver', 'lang:system::lang.updates.label_meta_version', 'required'], ['items.*.action', 'lang:system::lang.updates.label_meta_action', 'required|in:install,update'], ]; @@ -291,7 +291,7 @@ protected function validateProcess() $rules = []; if (post('step') != 'complete') { $rules[] = ['meta.code', 'lang:system::lang.updates.label_meta_code', 'required']; - $rules[] = ['meta.type', 'lang:system::lang.updates.label_meta_type', 'required']; + $rules[] = ['meta.type', 'lang:system::lang.updates.label_meta_type', 'required|in:core,extension,theme']; $rules[] = ['meta.version', 'lang:system::lang.updates.label_meta_version', 'required']; $rules[] = ['meta.hash', 'lang:system::lang.updates.label_meta_hash', 'required']; $rules[] = ['meta.description', 'lang:system::lang.updates.label_meta_description', 'sometimes']; From 09842bdb0c61b7baa21d044666b280fe6e699ba5 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Wed, 6 Oct 2021 10:44:19 +0100 Subject: [PATCH 20/24] Change to laravel 8 default mail config Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/classes/MailManager.php | 14 +++++++------- config/mail.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/system/classes/MailManager.php b/app/system/classes/MailManager.php index 9bfd978662..1656402ad8 100644 --- a/app/system/classes/MailManager.php +++ b/app/system/classes/MailManager.php @@ -95,24 +95,24 @@ public function applyMailerConfigValues() { $config = App::make('config'); $settings = App::make('system.setting'); - $config->set('mail.driver', $settings->get('protocol')); + $config->set('mail.default', $settings->get('protocol')); $config->set('mail.from.name', $settings->get('sender_name')); $config->set('mail.from.address', $settings->get('sender_email')); switch ($settings->get('protocol')) { case 'sendmail': - $config->set('mail.sendmail', $settings->get('sendmail_path')); + $config->set('mail.mailers.sendmail.path', $settings->get('sendmail_path')); break; case 'smtp': - $config->set('mail.host', $settings->get('smtp_host')); - $config->set('mail.port', $settings->get('smtp_port')); - $config->set('mail.encryption', strlen($settings->get('smtp_encryption')) + $config->set('mail.mailers.smtp.host', $settings->get('smtp_host')); + $config->set('mail.mailers.smtp.port', $settings->get('smtp_port')); + $config->set('mail.mailers.smtp.encryption', strlen($settings->get('smtp_encryption')) ? $settings->get('smtp_encryption') : null ); - $config->set('mail.username', strlen($settings->get('smtp_user')) + $config->set('mail.mailers.smtp.username', strlen($settings->get('smtp_user')) ? $settings->get('smtp_user') : null ); - $config->set('mail.password', strlen($settings->get('smtp_pass')) + $config->set('mail.mailers.smtp.password', strlen($settings->get('smtp_pass')) ? $settings->get('smtp_pass') : null ); break; diff --git a/config/mail.php b/config/mail.php index 0a1e4df5cb..43a141b465 100644 --- a/config/mail.php +++ b/config/mail.php @@ -13,7 +13,7 @@ | */ - 'driver' => env('MAIL_MAILER', 'smtp'), + 'default' => env('MAIL_MAILER', 'smtp'), /* |-------------------------------------------------------------------------- From 0b041944a015902d823cd7af059ec7dfe9db66d5 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Thu, 14 Oct 2021 19:37:39 +0100 Subject: [PATCH 21/24] Remove optional value on Repeater::makeItemFormWidget method (#873) --- app/admin/formwidgets/Repeater.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/formwidgets/Repeater.php b/app/admin/formwidgets/Repeater.php index dc3c12bd68..906837d2ac 100644 --- a/app/admin/formwidgets/Repeater.php +++ b/app/admin/formwidgets/Repeater.php @@ -215,7 +215,7 @@ protected function processExistingItems() } } - protected function makeItemFormWidget($index = 0, $model) + protected function makeItemFormWidget($index, $model) { $data = null; if (!$model instanceof Model) { From 6db349a6876beb997c9faa0a4616f7c809287e4c Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Fri, 15 Oct 2021 10:39:42 +0100 Subject: [PATCH 22/24] Move boundary precision to config (#870) * Move boundary precision to config * Revert "Move boundary precision to config" This reverts commit ac1e60280eaedfdece2a056e6a069832b3cb7389. * Set a default value on precision Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/ServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/ServiceProvider.php b/app/system/ServiceProvider.php index c261e4d3a7..7cc037a1a2 100644 --- a/app/system/ServiceProvider.php +++ b/app/system/ServiceProvider.php @@ -325,7 +325,7 @@ protected function setConfiguration() $app['config']->set('geocoder.providers.nominatim.region', $region); $app['config']->set('geocoder.providers.google.apiKey', setting('maps_api_key')); - $app['config']->set('geocoder.precision', setting('geocoder_boundary_precision')); + $app['config']->set('geocoder.precision', setting('geocoder_boundary_precision', 8)); }); Event::listen(CommandStarting::class, function () { From 4a35c7a27a85065ce6e00ecb444c1aece1fc721a Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:44:21 +0100 Subject: [PATCH 23/24] Add ability for customer to cancel order and reservation Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/language/en/lang.php | 13 ++- app/admin/models/config/locations_model.php | 99 +++++++++++++-------- app/admin/requests/Location.php | 5 ++ 3 files changed, 79 insertions(+), 38 deletions(-) diff --git a/app/admin/language/en/lang.php b/app/admin/language/en/lang.php index a7fa118490..83f18d6ff5 100644 --- a/app/admin/language/en/lang.php +++ b/app/admin/language/en/lang.php @@ -469,12 +469,12 @@ 'text_title' => 'Locations', 'text_form_name' => 'Location', 'text_tab_general' => 'Location', - 'text_tab_data' => 'Settings', 'text_tab_schedules' => 'Schedules', 'text_tab_delivery_order' => 'Accepting Delivery Orders', 'text_tab_collection_order' => 'Accepting Pick-up Orders', - 'text_tab_reservation' => 'Accepting Reservations', - 'text_tab_delivery' => 'Delivery', + 'text_tab_orders' => 'Orders', + 'text_tab_reservation' => 'Reservations', + 'text_tab_delivery' => 'Delivery Areas', 'text_tab_gallery' => 'Gallery', 'text_tab_title_address' => 'Address', 'text_filter_search' => 'Search by name, city or state.', @@ -538,6 +538,8 @@ 'label_future_collection_order' => 'Allow Pre-order for Pick-up', 'label_future_delivery_days' => 'Delivery Pre-order Days In Advance', 'label_future_collection_days' => 'Pick-up Pre-order Days In Advance', + 'label_delivery_cancellation_timeout' => 'Deliver Order Cancellation Timeout', + 'label_collection_cancellation_timeout' => 'Pick-up Order Cancellation Timeout', 'label_payments' => 'Payments', 'label_offer_reservation' => 'Offer Reservations', 'label_reservation_time_interval' => 'Reservation Time Interval', @@ -547,6 +549,7 @@ 'label_auto_allocate_table' => 'Automatically Allocate Tables', 'label_limit_guests' => 'Limit Reservation Guests Count', 'label_limit_guests_count' => 'Maximum Guests Per Interval', + 'label_reservation_cancellation_timeout' => 'Reservation Cancellation Timeout', 'label_schedule_name' => 'Name', 'label_schedule_type' => 'Type', 'label_schedule_days' => 'Days', @@ -594,6 +597,8 @@ 'help_collection_time_interval' => 'Set the minutes between each pick-up order time available to your customer.', 'help_delivery_lead_time' => 'Set in minutes the average time it takes an order to be delivered after being placed', 'help_collection_lead_time' => 'Set in minutes the average time it takes an order to be ready for pick-up after being placed', + 'help_delivery_cancellation_timeout' => 'Set when a customer can no longer cancel a delivery order. Number of minutes before delivery time. Leave as 0, to disable customer delivery order cancellation.', + 'help_collection_cancellation_timeout' => 'Set when a customer can no longer cancel a pick-up order. Number of minutes before pick-up time. Leave as 0, to disable customer pick-up order cancellation.', 'help_future_delivery_days' => 'Set the number of days a customer can order for delivery in advance.', 'help_future_collection_days' => 'Set the number of days a customer can order for pick-up in advance.', 'help_flexible_hours' => 'Start typing to set the opening hours, such as 09:00-01:00 or 09:00-10:00,19:00-01:00', @@ -604,6 +609,7 @@ 'help_min_reservation_advance_time' => 'Set in days the minimum time before reservation that a guest can book a table', 'help_max_reservation_advance_time' => 'Set in days the maximum time before reservation that a guest can book a table', 'help_limit_guests_count' => 'Set the number of guests that can be booked between each time slot.', + 'help_reservation_cancellation_timeout' => 'Set when a customer can no longer cancel a booking. Number of minutes before booking time. Leave as 0, to disable customer booking cancellation.', 'help_delivery_areas' => 'Set delivery conditions to specific geographical area/boundaries. Delivery areas are applied in the order in which they appear. Every location must have at least one delivery area to accept delivery orders.', 'help_delivery_condition' => 'Use the table below to set different delivery charge conditions. Conditions/Rules are applied in the order in which they appear. For free delivery set charge to 0 or -1 to make delivery unavailable. When an \'all\' rule is present, no other condition will be applied.', 'help_delivery_components' => 'All rules must be VALID to apply this delivery area, each rule is matched against the user\'s address component. Values can contain Regular Expressions.', @@ -980,6 +986,7 @@ 'text_sale_permission_global_access' => 'Global Access', 'text_sale_permission_groups' => 'Groups', 'text_sale_permission_restricted' => 'Restricted Access', + 'text_impersonate' => 'Impersonate Staff', 'column_group' => 'Staff Groups', 'column_role' => 'Staff Roles', diff --git a/app/admin/models/config/locations_model.php b/app/admin/models/config/locations_model.php index c26690a063..4963333bee 100644 --- a/app/admin/models/config/locations_model.php +++ b/app/admin/models/config/locations_model.php @@ -228,9 +228,16 @@ 'size' => 'small', ], + 'options[working_hours]' => [ + 'tab' => 'lang:admin::lang.locations.text_tab_schedules', + 'type' => 'scheduleeditor', + 'context' => ['edit'], + 'form' => 'working_hours_model', + ], + 'options[limit_orders]' => [ 'label' => 'lang:admin::lang.locations.label_limit_orders', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 0, 'type' => 'switch', 'comment' => 'lang:admin::lang.locations.help_limit_orders', @@ -238,7 +245,7 @@ ], 'options[limit_orders_count]' => [ 'label' => 'lang:admin::lang.locations.label_limit_orders_count', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 50, 'type' => 'number', 'span' => 'right', @@ -252,19 +259,19 @@ 'delivery_order' => [ 'label' => 'lang:admin::lang.locations.text_tab_delivery_order', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'section', ], 'options[offer_delivery]' => [ 'label' => 'lang:admin::lang.locations.label_offer_delivery', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 1, 'type' => 'switch', 'span' => 'left', ], 'options[future_orders][enable_delivery]' => [ 'label' => 'lang:admin::lang.locations.label_future_delivery_order', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'switch', 'span' => 'right', 'trigger' => [ @@ -275,7 +282,7 @@ ], 'options[delivery_time_interval]' => [ 'label' => 'lang:admin::lang.locations.label_delivery_time_interval', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 15, 'type' => 'number', 'span' => 'left', @@ -288,7 +295,7 @@ ], 'options[future_orders][delivery_days]' => [ 'label' => 'lang:admin::lang.locations.label_future_delivery_days', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'number', 'default' => 5, 'span' => 'right', @@ -301,7 +308,7 @@ ], 'options[delivery_lead_time]' => [ 'label' => 'lang:admin::lang.locations.label_delivery_lead_time', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 25, 'type' => 'number', 'span' => 'left', @@ -314,7 +321,7 @@ ], 'options[delivery_time_restriction]' => [ 'label' => 'lang:admin::lang.locations.label_delivery_time_restriction', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'radiotoggle', 'span' => 'right', 'comment' => 'lang:admin::lang.locations.help_delivery_time_restriction', @@ -324,22 +331,30 @@ 'lang:admin::lang.locations.text_later_only', ], ], + 'options[delivery_cancellation_timeout]' => [ + 'label' => 'lang:admin::lang.locations.label_delivery_cancellation_timeout', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', + 'type' => 'number', + 'span' => 'left', + 'default' => 0, + 'comment' => 'lang:admin::lang.locations.help_delivery_cancellation_timeout', + ], 'collection_order' => [ 'label' => 'lang:admin::lang.locations.text_tab_collection_order', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'section', ], 'options[offer_collection]' => [ 'label' => 'lang:admin::lang.locations.label_offer_collection', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 1, 'type' => 'switch', 'span' => 'left', ], 'options[future_orders][enable_collection]' => [ 'label' => 'lang:admin::lang.locations.label_future_collection_order', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'switch', 'span' => 'right', 'trigger' => [ @@ -350,7 +365,7 @@ ], 'options[collection_time_interval]' => [ 'label' => 'lang:admin::lang.locations.label_collection_time_interval', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 15, 'type' => 'number', 'span' => 'left', @@ -363,7 +378,7 @@ ], 'options[future_orders][collection_days]' => [ 'label' => 'lang:admin::lang.locations.label_future_collection_days', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'number', 'default' => 5, 'span' => 'right', @@ -376,7 +391,7 @@ ], 'options[collection_lead_time]' => [ 'label' => 'lang:admin::lang.locations.label_collection_lead_time', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'default' => 25, 'type' => 'number', 'span' => 'left', @@ -389,7 +404,7 @@ ], 'options[collection_time_restriction]' => [ 'label' => 'lang:admin::lang.locations.label_collection_time_restriction', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', 'type' => 'radiotoggle', 'span' => 'right', 'comment' => 'lang:admin::lang.locations.help_collection_time_restriction', @@ -399,22 +414,25 @@ 'lang:admin::lang.locations.text_later_only', ], ], - - 'reservation' => [ - 'label' => 'lang:admin::lang.locations.text_tab_reservation', - 'tab' => 'lang:admin::lang.locations.text_tab_data', - 'type' => 'section', + 'options[collection_cancellation_timeout]' => [ + 'label' => 'lang:admin::lang.locations.label_collection_cancellation_timeout', + 'tab' => 'lang:admin::lang.locations.text_tab_orders', + 'type' => 'number', + 'span' => 'left', + 'default' => 0, + 'comment' => 'lang:admin::lang.locations.help_collection_cancellation_timeout', ], + 'options[offer_reservation]' => [ 'label' => 'lang:admin::lang.locations.label_offer_reservation', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 1, 'type' => 'switch', 'span' => 'left', ], 'options[auto_allocate_table]' => [ 'label' => 'lang:admin::lang.locations.label_auto_allocate_table', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 1, 'type' => 'switch', 'span' => 'right', @@ -426,7 +444,7 @@ ], 'options[reservation_time_interval]' => [ 'label' => 'lang:admin::lang.locations.label_reservation_time_interval', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 15, 'type' => 'number', 'span' => 'left', @@ -439,7 +457,7 @@ ], 'options[reservation_stay_time]' => [ 'label' => 'lang:admin::lang.locations.label_reservation_stay_time', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 45, 'type' => 'number', 'span' => 'right', @@ -452,30 +470,40 @@ ], 'options[min_reservation_advance_time]' => [ 'label' => 'lang:admin::lang.locations.label_min_reservation_advance_time', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 2, 'type' => 'number', 'span' => 'left', 'comment' => 'lang:admin::lang.locations.help_min_reservation_advance_time', + 'trigger' => [ + 'action' => 'enable', + 'field' => 'options[offer_reservation]', + 'condition' => 'checked', + ], ], 'options[max_reservation_advance_time]' => [ 'label' => 'lang:admin::lang.locations.label_max_reservation_advance_time', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 30, 'type' => 'number', 'span' => 'right', 'comment' => 'lang:admin::lang.locations.help_max_reservation_advance_time', + 'trigger' => [ + 'action' => 'enable', + 'field' => 'options[offer_reservation]', + 'condition' => 'checked', + ], ], 'options[limit_guests]' => [ 'label' => 'lang:admin::lang.locations.label_limit_guests', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 0, 'type' => 'switch', 'span' => 'left', ], 'options[limit_guests_count]' => [ 'label' => 'lang:admin::lang.locations.label_limit_guests_count', - 'tab' => 'lang:admin::lang.locations.text_tab_data', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', 'default' => 20, 'type' => 'number', 'span' => 'right', @@ -486,12 +514,13 @@ 'condition' => 'checked', ], ], - - 'options[working_hours]' => [ - 'tab' => 'lang:admin::lang.locations.text_tab_schedules', - 'type' => 'scheduleeditor', - 'context' => ['edit'], - 'form' => 'working_hours_model', + 'options[reservation_cancellation_timeout]' => [ + 'label' => 'lang:admin::lang.locations.label_reservation_cancellation_timeout', + 'tab' => 'lang:admin::lang.locations.text_tab_reservation', + 'type' => 'number', + 'span' => 'left', + 'default' => 0, + 'comment' => 'lang:admin::lang.locations.help_reservation_cancellation_timeout', ], 'options[payments]' => [ diff --git a/app/admin/requests/Location.php b/app/admin/requests/Location.php index 194a47eec1..95cd1fbeb7 100644 --- a/app/admin/requests/Location.php +++ b/app/admin/requests/Location.php @@ -37,12 +37,17 @@ public function rules() ['options.future_orders.collection_days', 'admin::lang.locations.label_future_collection_days', 'integer'], ['options.delivery_time_restriction', 'admin::lang.locations.label_delivery_time_restriction', 'nullable|integer|max:2'], ['options.collection_time_restriction', 'admin::lang.locations.label_collection_time_restriction', 'nullable|integer|max:2'], + ['options.delivery_cancellation_timeout', 'admin::lang.locations.label_delivery_cancellation_timeout', 'integer|min:0|max:999'], + ['options.collection_cancellation_timeout', 'admin::lang.locations.label_collection_cancellation_timeout', 'integer|min:0|max:999'], ['options.payments.*', 'admin::lang.locations.label_payments'], ['options.reservation_time_interval', 'admin::lang.locations.label_reservation_time_interval|min:5', 'integer'], ['options.reservation_stay_time', 'admin::lang.locations.reservation_stay_time|min:5', 'integer'], ['options.auto_allocate_table', 'admin::lang.locations.label_auto_allocate_table', 'integer'], ['options.limit_guests', 'admin::lang.locations.label_limit_guests', 'boolean'], ['options.limit_guests_count', 'admin::lang.locations.label_limit_guests_count', 'integer|min:1|max:999'], + ['options.min_reservation_advance_time', 'admin::lang.locations.label_min_reservation_advance_time', 'integer|min:0|max:999'], + ['options.max_reservation_advance_time', 'admin::lang.locations.label_max_reservation_advance_time', 'integer|min:0|max:999'], + ['options.reservation_cancellation_timeout', 'admin::lang.locations.label_reservation_cancellation_timeout', 'integer|min:0|max:999'], ['location_status', 'admin::lang.label_status', 'boolean'], ['permalink_slug', 'admin::lang.locations.label_permalink_slug', 'alpha_dash|max:255'], ['gallery.title', 'admin::lang.locations.label_gallery_title', 'max:128'], From d227ec6b66c3caf0c0d0793da10ccdf0cfc4fef3 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:49:37 +0100 Subject: [PATCH 24/24] Improve user panel Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/ServiceProvider.php | 17 ++- app/admin/classes/Location.php | 5 + app/admin/classes/UserPanel.php | 116 ++++++++++++++++++ app/admin/models/Staffs_model.php | 5 + app/admin/models/User_preferences_model.php | 2 - app/admin/models/config/staffs_model.php | 2 +- .../_partials/top_nav_user_menu.blade.php | 76 +++++------- 7 files changed, 177 insertions(+), 46 deletions(-) create mode 100644 app/admin/classes/UserPanel.php diff --git a/app/admin/ServiceProvider.php b/app/admin/ServiceProvider.php index 198a37303d..e116a07b4f 100644 --- a/app/admin/ServiceProvider.php +++ b/app/admin/ServiceProvider.php @@ -5,6 +5,7 @@ use Admin\Classes\Navigation; use Admin\Classes\OnboardingSteps; use Admin\Classes\PermissionManager; +use Admin\Classes\UserState; use Admin\Classes\Widgets; use Admin\Facades\AdminLocation; use Admin\Facades\AdminMenu; @@ -13,6 +14,7 @@ use Igniter\Flame\Foundation\Providers\AppServiceProvider; use Illuminate\Console\Scheduling\Schedule; use Illuminate\Database\Eloquent\Relations\Relation; +use Illuminate\Support\Collection; use Illuminate\Support\Facades\Event; use System\Classes\MailManager; use System\Libraries\Assets; @@ -278,7 +280,20 @@ protected function registerMainMenuItems() 'user' => [ 'type' => 'partial', 'path' => 'top_nav_user_menu', - 'markAsRead' => ['Admin\Classes\Location', 'setStaffCurrent'], + 'options' => ['Admin\Classes\UserPanel', 'listMenuLinks'], + ], + ]); + }); + + Event::listen('admin.menu.extendUserMenuLinks', function (Collection $items) { + $items->put('userState', [ + 'priority' => 10, + 'label' => 'admin::lang.text_set_status', + 'iconCssClass' => 'fa fa-circle fa-fw text-'.UserState::forUser()->getStatusColorName(), + 'attributes' => [ + 'data-toggle' => 'modal', + 'data-target' => '#editStaffStatusModal', + 'role' => 'button', ], ]); }); diff --git a/app/admin/classes/Location.php b/app/admin/classes/Location.php index 52aed8212a..f7c4ff8c9e 100644 --- a/app/admin/classes/Location.php +++ b/app/admin/classes/Location.php @@ -72,6 +72,11 @@ public function getId() return optional($this->getLocation())->getKey(); } + public function getName() + { + return optional($this->getLocation())->location_name; + } + public function getAll() { if ($this->getAuth()->isSuperUser()) diff --git a/app/admin/classes/UserPanel.php b/app/admin/classes/UserPanel.php new file mode 100644 index 0000000000..6646705434 --- /dev/null +++ b/app/admin/classes/UserPanel.php @@ -0,0 +1,116 @@ +user = $user ?: AdminAuth::getUser(); + $instance->location = $location ?: AdminLocation::current(); + + return $instance; + } + + public static function listMenuLinks($menu, $item, $user) + { + if (self::$menuLinksCache) + return self::$menuLinksCache; + + $items = collect([ + 'account' => [ + 'label' => 'admin::lang.text_edit_details', + 'iconCssClass' => 'fa fa-user fa-fw', + 'url' => admin_url('staffs/account'), + 'priority' => 20, + ], + 'logout' => [ + 'label' => 'admin::lang.text_logout', + 'cssClass' => 'text-danger', + 'iconCssClass' => 'fa fa-power-off fa-fw', + 'url' => admin_url('logout'), + ], + ]); + + Event::fire('admin.menu.extendUserMenuLinks', [$items]); + + $instance = self::forUser(); + + return self::$menuLinksCache = $items + ->mapWithKeys(function ($item, $code) { + $item = array_merge([ + 'priority' => 999, + 'label' => null, + 'cssClass' => null, + 'iconCssClass' => null, + 'attributes' => [], + 'permission' => null, + ], $item); + + if (array_key_exists('url', $item)) { + $item['attributes']['href'] = $item['url']; + } + + return [ + $code => (object)$item, + ]; + }) + ->filter(function ($item) use ($instance) { + if (!$permission = array_get($item, 'permission')) + return TRUE; + + return $instance->user->hasPermission($permission); + }) + ->sortBy('priority'); + } + + public function getUserName() + { + return $this->user->staff->staff_name; + } + + public function getLocationName() + { + return optional($this->location)->location_name; + } + + public function getAvatarUrl() + { + return $this->user->staff->avatar_url; + } + + public function hasActiveLocation() + { + return AdminLocation::check(); + } + + public function listGroupNames() + { + return $this->user->staff->groups->pluck('staff_group_name')->all(); + } + + public function listLocations() + { + return AdminLocation::listLocations()->map(function ($value, $key) { + return (object)[ + 'id' => $key, + 'name' => $value, + 'active' => $key === optional($this->location)->location_id, + ]; + }); + } +} diff --git a/app/admin/models/Staffs_model.php b/app/admin/models/Staffs_model.php index f3f00df0e7..05aa0c3f68 100644 --- a/app/admin/models/Staffs_model.php +++ b/app/admin/models/Staffs_model.php @@ -75,6 +75,11 @@ public function getEmailAttribute() return $this->staff_email; } + public function getAvatarUrlAttribute() + { + return '//www.gravatar.com/avatar/'.md5(strtolower(trim($this->staff_email))).'.png?d=mm'; + } + public static function getDropdownOptions() { return static::isEnabled()->dropdown('staff_name'); diff --git a/app/admin/models/User_preferences_model.php b/app/admin/models/User_preferences_model.php index 2844c4b426..93c4db0a81 100644 --- a/app/admin/models/User_preferences_model.php +++ b/app/admin/models/User_preferences_model.php @@ -13,8 +13,6 @@ class User_preferences_model extends Model */ protected $table = 'user_preferences'; - public $timestamps = FALSE; - protected $casts = [ 'user_id' => 'integer', 'value' => 'json', diff --git a/app/admin/models/config/staffs_model.php b/app/admin/models/config/staffs_model.php index ad1a56e142..7f5ee90bd4 100644 --- a/app/admin/models/config/staffs_model.php +++ b/app/admin/models/config/staffs_model.php @@ -167,7 +167,7 @@ 'context' => ['edit'], ], 'impersonate' => [ - 'label' => 'lang:admin::lang.customers.text_impersonate', + 'label' => 'lang:admin::lang.staff.text_impersonate', 'class' => 'btn btn-default', 'data-request' => 'onImpersonate', 'data-request-confirm' => 'admin::lang.customers.alert_impersonate_confirm', diff --git a/app/admin/views/_partials/top_nav_user_menu.blade.php b/app/admin/views/_partials/top_nav_user_menu.blade.php index b65c74b089..8ec7c0b117 100644 --- a/app/admin/views/_partials/top_nav_user_menu.blade.php +++ b/app/admin/views/_partials/top_nav_user_menu.blade.php @@ -1,69 +1,61 @@ @php - $staffLocationId = AdminLocation::getId(); - $staffAvatar = '//www.gravatar.com/avatar/'.md5(strtolower(trim(AdminAuth::getStaffEmail()))).'.png?s=64&d=mm'; - $staffLocations = AdminLocation::listLocations()->all(); - $staffGroupNames = implode(', ', AdminAuth::staff()->groups->pluck('staff_group_name')->all()); - $staffState = \Admin\Classes\UserState::forUser(); + $userPanel = \Admin\Classes\UserPanel::forUser(); @endphp
  • - +
    -
    {{ AdminAuth::getStaffName() }}
    -
    {{ $staffGroupNames }}
    +
    {{ $userPanel->getUserName() }}
    +
    {{ implode(', ', $userPanel->listGroupNames()) }}
    - @if(AdminLocation::hasLocations() AND $staffLocations) -
    -
    -
    -
    -
    - -
    +
    + +
    +
    +
    +
    +
    + @if(count($userPanel->listLocations()) <= 1) + + @else -
    - -
    - @endif - - @lang('admin::lang.text_set_status') - - - @lang('admin::lang.text_edit_details') - - - @lang('admin::lang.text_logout') - + @endif +
    + +
    + + @foreach ($item->options() as $item) + attributes) !!}> + @lang($item->label) + + @endforeach @lang('admin::lang.text_about_tastyigniter')