Apply fix (#262)

* Update Models and create factories * Add carrier Seeder and fix issues * fix code formatting --------- Co-authored-by: mckenziearts <[email protected]>
shopperlabs · Jun 10, 2024 · 48bab84 · 48bab84
1 parent 86662b2
commit 48bab84
Show file tree

Hide file tree

Showing 66 changed files with 628 additions and 617 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
         <img src="https://github.com/shopperlabs/framework/workflows/tests/badge.svg" alt="Build Status">
     </a>
     <a href="https://laravel.com">
-        <img alt="Laravel v9.x" src="https://img.shields.io/badge/Laravel-v9.x-FF2D20">
+        <img alt="Laravel v10.x" src="https://img.shields.io/badge/Laravel-v10.x-FF2D20">
     </a>
     <a href="https://packagist.org/packages/shopper/framework">
         <img src="https://img.shields.io/packagist/dt/shopper/framework" alt="Total Downloads">

diff --git a/composer.lock b/composer.lock
diff --git a/packages/admin/.prettierrc b/packages/admin/.prettierrc
@@ -2,7 +2,7 @@
     "printWidth": 120,
     "semi": false,
     "singleQuote": true,
-    "tabWidth": 4,
+    "tabWidth": 2,
     "tailwindConfig": "./tailwind.config.js",
     "trailingComma": "all",
     "plugins": [
@@ -15,7 +15,8 @@
                 "*.blade.php"
             ],
             "options": {
-                "parser": "blade"
+                "parser": "blade",
+                "tabWidth": 4
             }
         }
     ]

diff --git a/packages/admin/composer.json b/packages/admin/composer.json
@@ -47,7 +47,7 @@
     "shopper/sidebar": "self.version",
     "spatie/laravel-livewire-wizard": "^2.2",
     "spatie/laravel-package-tools": "^1.15",
-    "stevebauman/location": "^6.3.1",
+    "stevebauman/location": "^7.2",
     "wire-elements/modal": "^2.0"
   },
   "autoload": {

diff --git a/packages/admin/public/shopper.css b/packages/admin/public/shopper.css
@@ -3681,6 +3681,10 @@ html {
   z-index: 1;
 }
 
+.order-first {
+  order: -9999;
+}
+
 .col-\[--col-span-default\] {
   grid-column: var(--col-span-default);
 }
@@ -3842,10 +3846,6 @@ html {
   margin-left: -1px;
 }
 
-.-mr-1 {
-  margin-right: -0.25rem;
-}
-
 .-mr-14 {
   margin-right: -3.5rem;
 }
@@ -4105,10 +4105,6 @@ html {
   height: 0.625rem;
 }
 
-.h-24 {
-  height: 6rem;
-}
-
 .h-3 {
   height: 0.75rem;
 }
@@ -4309,10 +4305,6 @@ html {
   width: 2rem;
 }
 
-.w-80 {
-  width: 20rem;
-}
-
 .w-9 {
   width: 2.25rem;
 }
@@ -4571,11 +4563,6 @@ html {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.-translate-y-2 {
-  --tw-translate-y: -0.5rem;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 .translate-x-0 {
   --tw-translate-x: 0px;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
@@ -4694,6 +4681,12 @@ html {
           user-select: none;
 }
 
+.select-all {
+  -webkit-user-select: all;
+     -moz-user-select: all;
+          user-select: all;
+}
+
 .resize-none {
   resize: none;
 }
@@ -4994,12 +4987,6 @@ html {
   margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse)));
 }
 
-.space-x-6 > :not([hidden]) ~ :not([hidden]) {
-  --tw-space-x-reverse: 0;
-  margin-right: calc(1.5rem * var(--tw-space-x-reverse));
-  margin-left: calc(1.5rem * calc(1 - var(--tw-space-x-reverse)));
-}
-
 .space-x-8 > :not([hidden]) ~ :not([hidden]) {
   --tw-space-x-reverse: 0;
   margin-right: calc(2rem * var(--tw-space-x-reverse));
@@ -5507,11 +5494,6 @@ html {
   background-color: rgb(14 165 233 / var(--tw-bg-opacity));
 }
 
-.bg-orange-100 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(255 237 213 / var(--tw-bg-opacity));
-}
-
 .bg-primary-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(219 234 254 / var(--tw-bg-opacity));
@@ -5587,10 +5569,6 @@ html {
   background-color: rgb(255 255 255 / 0.8);
 }
 
-.bg-white\/90 {
-  background-color: rgb(255 255 255 / 0.9);
-}
-
 .bg-yellow-50 {
   --tw-bg-opacity: 1;
   background-color: rgb(254 252 232 / var(--tw-bg-opacity));
@@ -5609,6 +5587,10 @@ html {
   --tw-bg-opacity: 0.75;
 }
 
+.\!bg-none {
+  background-image: none !important;
+}
+
 .bg-gradient-to-b {
   background-image: linear-gradient(to bottom, var(--tw-gradient-stops));
 }
@@ -6325,11 +6307,6 @@ html {
   color: rgb(3 105 161 / var(--tw-text-opacity));
 }
 
-.text-orange-800 {
-  --tw-text-opacity: 1;
-  color: rgb(154 52 18 / var(--tw-text-opacity));
-}
-
 .text-primary-400 {
   --tw-text-opacity: 1;
   color: rgb(96 165 250 / var(--tw-text-opacity));
@@ -6464,12 +6441,6 @@ html {
   box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
 }
 
-.shadow-md {
-  --tw-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);
-  --tw-shadow-colored: 0 4px 6px -1px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);
-  box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
-}
-
 .shadow-sm {
   --tw-shadow: 0 1px 2px 0 rgb(0 0 0 / 0.05);
   --tw-shadow-colored: 0 1px 2px 0 var(--tw-shadow-color);
@@ -6521,11 +6492,6 @@ html {
   --tw-ring-inset: inset;
 }
 
-.ring-black {
-  --tw-ring-opacity: 1;
-  --tw-ring-color: rgb(0 0 0 / var(--tw-ring-opacity));
-}
-
 .ring-custom-600 {
   --tw-ring-opacity: 1;
   --tw-ring-color: rgba(var(--c-600), var(--tw-ring-opacity));
@@ -6588,10 +6554,6 @@ html {
   --tw-ring-color: rgb(255 255 255 / 0.1);
 }
 
-.ring-opacity-5 {
-  --tw-ring-opacity: 0.05;
-}
-
 .blur {
   --tw-blur: blur(8px);
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
@@ -9766,11 +9728,6 @@ html.dark .shiki span {
   text-decoration-line: underline;
 }
 
-:is(.dark .dark\:divide-gray-600) > :not([hidden]) ~ :not([hidden]) {
-  --tw-divide-opacity: 1;
-  border-color: rgba(var(--gray-600), var(--tw-divide-opacity));
-}
-
 :is(.dark .dark\:divide-gray-700) > :not([hidden]) ~ :not([hidden]) {
   --tw-divide-opacity: 1;
   border-color: rgba(var(--gray-700), var(--tw-divide-opacity));
@@ -9864,10 +9821,6 @@ html.dark .shiki span {
   background-color: rgba(var(--gray-800), 0.8);
 }
 
-:is(.dark .dark\:bg-gray-800\/90) {
-  background-color: rgba(var(--gray-800), 0.9);
-}
-
 :is(.dark .dark\:bg-gray-900) {
   --tw-bg-opacity: 1;
   background-color: rgba(var(--gray-900), var(--tw-bg-opacity));
@@ -10401,10 +10354,6 @@ html.dark .shiki span {
     grid-column: var(--col-span-sm);
   }
 
-  .sm\:col-span-1 {
-    grid-column: span 1 / span 1;
-  }
-
   .sm\:col-span-2 {
     grid-column: span 2 / span 2;
   }
@@ -10642,10 +10591,6 @@ html.dark .shiki span {
     gap: 1.25rem;
   }
 
-  .sm\:gap-6 {
-    gap: 1.5rem;
-  }
-
   .sm\:gap-x-4 {
     -moz-column-gap: 1rem;
          column-gap: 1rem;
@@ -10733,11 +10678,6 @@ html.dark .shiki span {
     padding-bottom: 0.375rem;
   }
 
-  .sm\:py-12 {
-    padding-top: 3rem;
-    padding-bottom: 3rem;
-  }
-
   .sm\:py-20 {
     padding-top: 5rem;
     padding-bottom: 5rem;

diff --git a/packages/admin/public/shopper.js b/packages/admin/public/shopper.js
diff --git a/packages/admin/resources/lang/fr/forms.php b/packages/admin/resources/lang/fr/forms.php
@@ -149,7 +149,7 @@
         'disable' => 'Désactiver',
         'edit' => 'Éditer',
         'view' => 'Voir',
-        'enable' => 'Activer',
+        'enable' => 'Activé',
         'export' => 'Exportez',
         'nevermind' => 'Peu importe',
         'update' => 'Modifier',
@@ -167,8 +167,8 @@
         'cancel_order' => 'Annuler',
         'send' => 'Envoyer',
         'logout_session' => 'Déconnecter les autres sessions',
-        'approve' => 'Approuver',
-        'disapprove' => 'Désapprouver',
+        'approve' => 'Approuvé',
+        'disapprove' => 'Désapprouvé',
         'create' => 'Créer',
         'upload' => 'Télécharger',
         'verified' => 'Vérifié',

diff --git a/packages/admin/resources/lang/fr/modals.php b/packages/admin/resources/lang/fr/modals.php
@@ -7,7 +7,7 @@
         'new' => 'Nouvelle permission',
         'new_description' => 'Ajouter une nouvelle autorisation et l\'attribuer directement à ce rôle',
         'labels' => [
-            'name' => 'Nom de la permission (en minuscules)',
+            'name' => 'Permission (en minuscules)',
         ],
     ],
 

diff --git a/packages/admin/resources/lang/fr/pages/attributes.php b/packages/admin/resources/lang/fr/pages/attributes.php
@@ -17,6 +17,7 @@
     'description' => 'Les attributes associés à votre produit. Ces attributs une fois sélectionnés, pourront être associés pour générer une combinaison de variantes',
 
     'values' => [
+        'slug' => 'Valeurs',
         'title' => 'Valeurs d\'attributs',
         'description' => 'Ajouter des valeurs par défaut pour cet attribut. Ces valeurs pourront être disponibles dans l\' onglet attributs des produits.',
     ],

diff --git a/packages/admin/resources/views/components/attribute-card.blade.php b/packages/admin/resources/views/components/attribute-card.blade.php
@@ -21,7 +21,7 @@ class="h-5 w-5 text-gray-400 dark:text-gray-500"
             </h5>
             @if ($activated)
                 <x-filament::badge size="sm" color="success" icon="untitledui-check-verified">
-                    {{ __('shopper::forms.actions.enabled') }}
+                    {{ __('shopper::forms.actions.enable') }}
                 </x-filament::badge>
             @endif
         </div>

diff --git a/packages/admin/resources/views/components/layouts/app/header.blade.php b/packages/admin/resources/views/components/layouts/app/header.blade.php
@@ -15,51 +15,6 @@ class="border-r border-gray-200 px-4 text-gray-500 focus:bg-gray-100 focus:text-
             @endif
         </div>
         <div class="ml-4 flex items-center space-x-3 lg:ml-6 lg:space-x-4">
-            <div
-                x-data="{ show: false }"
-                @keydown.esc.stop="show = false"
-                x-on:shortcut-list.window="show = !show"
-                @click.away="show = false"
-                class="relative inline-block"
-            >
-                <button
-                    @click="show = !show"
-                    type="button"
-                    class="inline-flex items-center space-x-2 rounded-lg p-1 text-sm leading-5 text-gray-500 ring-1 ring-gray-200 hover:bg-gray-50 hover:text-gray-700 dark:text-gray-300 dark:ring-gray-700 dark:hover:bg-gray-800 dark:hover:text-gray-300"
-                >
-                    <x-untitledui-keyboard class="h-6 w-6" stroke-width="1.5" aria-hidden="true" />
-                </button>
-                <div
-                    x-cloak
-                    x-show="show"
-                    x-transition:enter="transition duration-100 ease-out"
-                    x-transition:enter-start="-translate-y-2 transform opacity-0"
-                    x-transition:enter-end="translate-y-0 transform opacity-100"
-                    x-transition:leave="transition duration-75 ease-in"
-                    x-transition:leave-start="translate-y-0 transform opacity-100"
-                    x-transition:leave-end="-translate-y-2 transform opacity-0"
-                    class="absolute right-0 z-10 mt-2 w-80 origin-top-right rounded-lg bg-white/90 shadow-md ring-1 ring-black ring-opacity-5 backdrop-blur-md focus:outline-none dark:bg-gray-800/90 dark:ring-gray-800"
-                    aria-orientation="vertical"
-                    role="menu"
-                >
-                    <ul class="divide-y divide-gray-200 py-1 dark:divide-gray-700" role="list">
-                        @if (config('shopper.components.search'))
-                            <x-shopper::shortcut :name="__('shopper::words.global_search')" command="Ctrl" param="K" />
-                        @endif
-
-                        <x-shopper::shortcut
-                            :name="__('shopper::words.display_shortcuts')"
-                            command="Shift"
-                            param="F1"
-                        />
-                        <x-shopper::shortcut
-                            :name="__('shopper::words.go_to_documentation')"
-                            command="Alt"
-                            param="D"
-                        />
-                    </ul>
-                </div>
-            </div>
             <a
                 href="{{ url('/') }}"
                 target="_blank"

diff --git a/packages/admin/resources/views/components/layouts/base.blade.php b/packages/admin/resources/views/components/layouts/base.blade.php
@@ -1,7 +1,7 @@
 @props(['title' => config('app.name')])
 
 <!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="shopper min-h-screen scroll-smooth antialiased">
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="sh min-h-screen scroll-smooth antialiased">
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />

diff --git a/packages/admin/resources/views/filament/section.blade.php b/packages/admin/resources/views/filament/section.blade.php
@@ -9,8 +9,6 @@
     :compact="$isCompact()"
     :content-before="$isFormBefore()"
     :description="$getDescription()"
-    :footer-actions="$getFooterActions()"
-    :footer-actions-alignment="$getFooterActionsAlignment()"
     :header-actions="$getHeaderActions()"
     :heading="$getHeading()"
     :icon="$getIcon()"

diff --git a/packages/admin/resources/views/livewire/components/customers/orders.blade.php b/packages/admin/resources/views/livewire/components/customers/orders.blade.php
@@ -12,7 +12,7 @@ class="text-xs font-medium uppercase leading-4 tracking-wider text-gray-500 dark
                             {{ __('shopper::pages/customers.orders.placed') }}
                         </dt>
                         <dd class="mt-1 text-sm font-medium text-gray-900 dark:text-white">
-                            {{ $order->created_at->formatLocalized('%d %B %G - %H:%M') }}
+                            {{ $order->created_at->translatedFormat('j F Y H:i') }}
                         </dd>
                     </div>
                     <div class="mt-5 sm:mt-0">