diff --git a/app/Http/Controllers/API/SyncController.php b/app/Http/Controllers/API/SyncController.php index 985ce98..14f6d0a 100644 --- a/app/Http/Controllers/API/SyncController.php +++ b/app/Http/Controllers/API/SyncController.php @@ -150,44 +150,6 @@ class SyncController extends Controller ); } - /** - * @param \Illuminate\Http\Request $request - * @return array - */ - public function getVersion(Request $request): array - { - $app_uuid = $request->app_uuid; - $app_version = $request->app_version; - $version = Setting::query() - ->where('tenant_id', \tenant()->getKey()) - ->where('key', 'version') - ->value('value'); - $ShowIsActive = Setting::query() - ->where('tenant_id', \tenant()->getKey()) - ->where('key', 'ShowIsActive') - ->value('value'); - - try { - $client = new \GuzzleHttp\Client(); - $response = $client->request( - 'GET', - 'https://store.ldc.fr/api/get-version?token=@P$oi6or!bL2-r%3C&app_uuid=' . $app_uuid - ); - $body = $response->getBody(); - $storeVersion = json_decode($body)->version; - } catch (ClientException $e) { - $storeVersion = $app_version; - } - - if ($storeVersion > $app_version) { - $newApp = true; - } else { - $newApp = false; - } - - return ['version' => $version, 'ShowIsActive' => $ShowIsActive, 'newApp' => $newApp]; - } - /** * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ diff --git a/app/Http/Requests/Bo/Settings/UpdateSettingRequest.php b/app/Http/Requests/Bo/Settings/UpdateSettingRequest.php index 6e5be30..f9e39cc 100644 --- a/app/Http/Requests/Bo/Settings/UpdateSettingRequest.php +++ b/app/Http/Requests/Bo/Settings/UpdateSettingRequest.php @@ -22,8 +22,7 @@ class UpdateSettingRequest extends FormRequest if ( $this->key === "Button1" || $this->key === "Button2" || - $this->key === "Button3" || - $this->key === "ShowIsActive" + $this->key === "Button3" ) { return Gate::check('update', $this->route('setting')); } else { @@ -40,9 +39,7 @@ class UpdateSettingRequest extends FormRequest */ protected function prepareForValidation(): void { - if ($this->key === "ShowIsActive") { - $this->merge(['value' => intval($this->value) ? "true" : "false"]); - } elseif ( + if ( $this->key === "Button1" || $this->key === "Button2" || $this->key === "Button3" diff --git a/app/Models/Setting.php b/app/Models/Setting.php index 87dad92..bbebfbc 100644 --- a/app/Models/Setting.php +++ b/app/Models/Setting.php @@ -107,8 +107,6 @@ class Setting extends Model { // @phpcs:disable Generic.Files.LineLength.TooLong $array = [ - ['key' => 'version', 'value' => '1', 'type' => SettingTypesEnum::numeric], - ['key' => 'ShowIsActive', 'value' => '0', 'type' => SettingTypesEnum::boolean], ['key' => 'MainColor', 'value' => '#FFF', 'type' => SettingTypesEnum::color], ['key' => 'SquaredLogo', 'value' => new \SplFileInfo(\resource_path('assets/settings/SquaredLogo.png')), 'type' => SettingTypesEnum::picture], ['key' => 'RectangleLogo', 'value' => new \SplFileInfo(\resource_path('assets/settings/RectangleLogo.png')), 'type' => SettingTypesEnum::picture], @@ -117,10 +115,6 @@ class Setting extends Model ['key' => 'Button1', 'value' => null, 'type' => SettingTypesEnum::directory], ['key' => 'Button2', 'value' => null, 'type' => SettingTypesEnum::directory], ['key' => 'Button3', 'value' => null, 'type' => SettingTypesEnum::directory], - ['key' => 'AppStoreUUID', 'value' => 'c4ac09fd-3992-47bc-bdee-0b7f5505e873', 'type' => SettingTypesEnum::string], - ['key' => 'FormSelect1', 'value' => '{"title":{"fr":"Travaille avec","en":"Work with","de":"Arbeit mit"},"values":{"pole-sable":{"fr":"P\u00f4le Sabl\u00e9","en":"P\u00f4le Sabl\u00e9","de":"P\u00f4le Sabl\u00e9"},"snv":{"fr":"SNV","en":"SNV","de":"SNV"},"pole-sud-est":{"fr":"P\u00f4le Sud-Est","en":"P\u00f4le Sud-Est","de":"P\u00f4le Sud-Est"},"aquitaine":{"fr":"Aquitaine","en":"Aquitaine","de":"Aquitaine"},"sbv":{"fr":"SBV","en":"SBV","de":"SBV"},"arrive":{"fr":"Arriv\u00e9","en":"Arriv\u00e9","de":"Arriv\u00e9"},"plusieurs-filiales":{"fr":"Plusieurs filiales","en":"Several subsidiaries","de":"Mehrere Filialen"},"autre":{"fr":"Autre","en":"Other","de":"Andere"}}}', 'type' => SettingTypesEnum::json], - ['key' => 'FormSelect2', 'value' => '{"title":{"fr":"Type de commerce","en":"Type of business","de":"Art des Gesch\u00e4fts"},"values":{"commerce-de-detail":{"fr":"Commerce de d\u00e9tail","en":"Retail trade","de":"Einzelhandel"},"restauration-commerciale":{"fr":"Restauration Commerciale","en":"Commercial catering","de":"Kommerzielle Restauration"},"restauration-collective":{"fr":"Restauration Collective","en":"Collective catering","de":"Kollektiv Restauration"},"grossiste-distributeur-cash":{"fr":"Grossiste Distributeur Cash","en":"Wholesale Distributor Cash","de":"Gro\u00dfh\u00e4ndler H\u00e4ndler Cash"},"pai":{"fr":"PAI","en":"PAI","de":"PAI"},"home-freezer-center":{"fr":"Home Freezer Center","en":"Home Freezer Center","de":"Home Gefrierzentrum"},"autres":{"fr":"Autre","en":"Other","de":"Andere"}}}', 'type' => SettingTypesEnum::json], - ['key' => 'FormCheck', 'value' => '[{"fr":"Frais","en":"Fresh","de":"Frisch"},{"fr":"Surgel\u00e9s","en":"Frozen food","de":"Tiefk\u00fchlkost"},{"fr":"Volailles crues","en":"Raw poultry","de":"Rohes Gefl\u00fcgel"},{"fr":"\u00c9labor\u00e9s crus","en":"Prepared raw","de":"Roh ausgearbeitet"},{"fr":"\u00c9labor\u00e9s cuits","en":"Cooked products","de":"Gekochte Elaborate"},{"fr":"Bio et Label Rouge","en":"Bio and Label Rouge","de":"Bio und Label Rouge"},{"fr":"BBC","en":"BBC","de":"BBC"},{"fr":"Halal","en":"Halal","de":"Halal"},{"fr":"Autre","en":"Other","de":"Andere"}]', 'type' => SettingTypesEnum::json], ]; // @phpcs:enable collect($array)->map(function (array $item) use ($tenant) { diff --git a/resources/views/bo/pages/settings/index-list.blade.php b/resources/views/bo/pages/settings/index-list.blade.php index e2e6a43..96676a8 100644 --- a/resources/views/bo/pages/settings/index-list.blade.php +++ b/resources/views/bo/pages/settings/index-list.blade.php @@ -24,8 +24,7 @@ @if (Auth::user()->role->equals(\App\Enums\UserRolesEnum::admin) || $settingModel->key === 'Button1' || $settingModel->key === 'Button2' || - $settingModel->key === 'Button3' || - $settingModel->key === 'ShowIsActive') + $settingModel->key === 'Button3')