Merge branch 'develop'

app/admin/formwidgets/Connector.php

@@ -116,6 +116,9 @@ public function loadAssets()
 
     public function getSaveValue($value)
     {
+        if (!$this->sortable)
+            return FormField::NO_SAVE_DATA;
+
         return (array)$this->processSaveValue($value);
     }
 
@@ -229,9 +232,6 @@ protected function processLoadValue()
 
     protected function processSaveValue($value)
     {
-        if (!$this->sortable)
-            return FormField::NO_SAVE_DATA;
-
         $items = $this->formField->value;
         if (!$items instanceof Collection)
             return $items;

app/admin/formwidgets/ScheduleEditor.php

@@ -126,7 +126,7 @@ protected function listSchedules()
             return $this->schedulesCache;
 
         $schedules = [];
-        foreach ($this->availableSchedules as $scheduleCode) {
+        foreach ($this->model->availableWorkingTypes() as $scheduleCode) {
             $schedules[$scheduleCode] = $this->model->createScheduleItem($scheduleCode);
         }
 

app/admin/formwidgets/codeeditor/codeeditor.blade.php

@@ -15,6 +15,6 @@ class="field-codeeditor size-{{ $size }}"
             id="{{ $this->getId('textarea') }}"
             rows="20"
             class="form-control"
-        >{!! trim($value) !!}</textarea>
+        >{{ trim($value) }}</textarea>
     </div>
 @endif

app/admin/traits/HasWorkingHours.php

@@ -5,6 +5,7 @@
 use Admin\Classes\ScheduleItem;
 use Carbon\Carbon;
 use Exception;
+use Igniter\Flame\Location\OrderTypes;
 use Igniter\Flame\Location\WorkingSchedule;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
@@ -41,7 +42,9 @@ public function getCurrentTime()
 
     public function availableWorkingTypes()
     {
-        return [static::OPENING, static::DELIVERY, static::COLLECTION];
+        return array_merge([
+            static::OPENING,
+        ], collect(OrderTypes::instance()->listOrderTypes())->keys()->all());
     }
 
     public function listWorkingHours()

app/admin/views/_mail/invite.blade.php

@@ -1,4 +1,4 @@
-subject = "Invitation to access {{ $site_name }}}"
+subject = "Invitation to access {{ $site_name }}"
 description = "Invite a new staff to access the TastyIgniter Admin"
 ==
 {{ $staff_name }}, you've been invited to access {{ $site_name }}

app/admin/views/_mail/invite_customer.blade.php

@@ -1,4 +1,4 @@
-subject = "Invitation to access {{ $site_name }}}"
+subject = "Invitation to access {{ $site_name }}"
 description = "Invite a new customer to access the website"
 ==
 {{ $full_name }}, you've been invited to access {{ $site_name }}

app/admin/widgets/Lists.php

@@ -253,7 +253,7 @@ protected function validateModel()
      */
     protected function parseTableName($sql, $table)
     {
-        return str_replace('@', $table.'.', $sql);
+        return str_replace('@', DB::getTablePrefix().$table.'.', $sql);
     }
 
     /**

app/main/template/Model.php

@@ -143,14 +143,14 @@ public static function getDropdownOptions(Theme $theme = null, $skipCache = FALS
 
     /**
      * Returns the unique id of this object.
-     * ex. account/login.php => account-login
-     * @return \Main\Classes\Theme
+     * ex. account/login.blade.php => account-login
+     * @return string
      */
     public function getId()
     {
         $fileName = $this->getBaseFileName();
 
-        return str_replace('/', '-', $fileName);
+        return str_replace('/', '-', str_before($fileName, '.blade'));
     }
 
     /**

app/system/assets/ui/js/updates.js

@@ -334,7 +334,7 @@
 
         $button.attr('disabled', true)
 
-        $form.request('onApplyItems').always(function () {
+        $form.request('onApplyRecommended').always(function () {
             $modal.modal('hide')
         }).done(function (json) {
             if (json['steps'])

app/system/classes/BaseComponent.php

@@ -115,8 +115,8 @@ public function onRender()
 
     /**
      * Renders a requested partial in context of this component,
-     * @see \Main\Classes\MainController::renderPartial for usage.
      * @return mixed
+     * @see \Main\Classes\MainController::renderPartial for usage.
      */
     public function renderPartial()
     {
@@ -150,7 +150,8 @@ public function getEventHandler($handler)
 
     public function param($name, $default = null)
     {
-        if (is_null($segment = $this->controller->param($name, $default)))
+        $segment = $this->controller->param($name);
+        if (is_null($segment))
             $segment = input($name);
 
         return is_null($segment) ? $default : $segment;

app/system/classes/UpdateManager.php

@@ -138,7 +138,7 @@ public function down()
         }
 
         // Rollback app
-        $modules = Config::get('system.modules', []);
+        $modules = array_reverse(Config::get('system.modules', []));
         foreach ($modules as $module) {
             $path = $this->getMigrationPath($module);
             $this->migrator->rollbackAll([$module => $path]);
@@ -465,9 +465,10 @@ public function getIgnoredUpdates()
 
     public function isMarkedAsIgnored($code)
     {
-        $ignoredUpdates = $this->getIgnoredUpdates();
+        if (!array_key_exists($code, $this->getInstalledItems()))
+            return FALSE;
 
-        return array_get($ignoredUpdates, $code, FALSE);
+        return array_get($this->getIgnoredUpdates(), $code, FALSE);
     }
 
     public function setSecurityKey($key, $info)

app/system/traits/ManagesUpdates.php

@@ -29,16 +29,30 @@ public function search()
         return $json;
     }
 
-    public function onApplyItems()
+    public function onApplyRecommended()
     {
-        $items = post('items') ?? [];
         $itemsCodes = post('install_items') ?? [];
-        if (!count($items) OR !count($itemsCodes))
+        $items = collect(post('items') ?? [])->whereIn('name', $itemsCodes);
+        if ($items->isEmpty())
             throw new ApplicationException(lang('system::lang.updates.alert_no_items'));
 
         $this->validateItems();
 
-        $items = collect($items)->whereIn('name', $itemsCodes)->all();
+        $response = UpdateManager::instance()->requestApplyItems($items->all());
+        $response = array_get($response, 'data', []);
+
+        return [
+            'steps' => $this->buildProcessSteps($response, $items),
+        ];
+    }
+
+    public function onApplyItems()
+    {
+        $items = post('items') ?? [];
+        if (!count($items))
+            throw new ApplicationException(lang('system::lang.updates.alert_no_items'));
+
+        $this->validateItems();
 
         $response = UpdateManager::instance()->requestApplyItems($items);
         $response = array_get($response, 'data', []);