feat: add pricing to product

feat: add variants generation slideovers

composer.json

@@ -21,6 +21,8 @@
   },
   "require-dev": {
     "bacon/bacon-qr-code": "^2.0",
+    "codeat3/blade-phosphor-icons": "^2.0",
+    "jaocero/radio-deck": "^1.2",
     "blade-ui-kit/blade-heroicons": "^2.5",
     "danharrin/livewire-rate-limiting": "^0.3|^1.0",
     "doctrine/dbal": "^3.6",
@@ -51,8 +53,6 @@
       "packages/core/src/helpers.php"
     ],
     "psr-4": {
-      "Database\\Factories\\": "packages/core/database/factories",
-      "Database\\Seeders\\": "packages/core/database/seeders",
       "Shopper\\": [
         "packages/admin/src",
         "packages/core/src",

packages/admin/composer.json

@@ -7,7 +7,7 @@
     "admin-panel",
     "shopper",
     "e-commerce",
-    "headless",
+    "headless cms",
     "store",
     "shop"
   ],
@@ -19,6 +19,7 @@
   "require": {
     "php": "^8.2",
     "bacon/bacon-qr-code": "^2.0",
+    "codeat3/blade-phosphor-icons": "^2.0",
     "danharrin/livewire-rate-limiting": "^0.3|^1.0",
     "filament/forms": "^3.2",
     "filament/spatie-laravel-media-library-plugin": "^3.2",
@@ -34,6 +35,8 @@
     "illuminate/support": "^10.0|^11.0",
     "illuminate/view": "^10.0|^11.0",
     "jenssegers/agent": "^2.6",
+    "jaocero/radio-deck": "^1.2",
+    "livewire/livewire": "^v3.5.12",
     "milon/barcode": "^10.0|^11.0",
     "pragmarx/google2fa": "^8.0",
     "psr/simple-cache": "^3.0",

packages/admin/config/components/product.php

@@ -15,7 +15,6 @@
 
     'pages' => [
         'product-index' => Livewire\Pages\Product\Index::class,
-        'product-create' => Livewire\Pages\Product\Create::class,
         'product-edit' => Livewire\Pages\Product\Edit::class,
         'variant-edit' => Livewire\Pages\Product\Variant::class,
         'attribute-index' => Livewire\Pages\Attribute\Browse::class,
@@ -31,18 +30,25 @@
         'products.form.attributes' => Components\Products\Form\Attributes::class,
         'products.form.edit' => Components\Products\Form\Edit::class,
         'products.form.media' => Components\Products\Form\Media::class,
+        'products.form.files' => Components\Products\Form\Files::class,
         'products.form.inventory' => Components\Products\Form\Inventory::class,
         'products.form.related-products' => Components\Products\Form\RelatedProducts::class,
         'products.form.seo' => Components\Products\Form\Seo::class,
         'products.form.shipping' => Components\Products\Form\Shipping::class,
         'products.form.variants' => Components\Products\Form\Variants::class,
         'products.variant-stock' => Components\Products\VariantStock::class,
+        'products.type-configuration' => Components\Products\ProductTypeConfiguration::class,
+        'products.pricing' => Components\Products\Pricing::class,
 
         'modals.related-products-list' => Livewire\Modals\RelatedProductsList::class,
 
+        'slide-overs.add-product' => Livewire\SlideOvers\AddProductForm::class,
         'slide-overs.add-variant' => Livewire\SlideOvers\AddVariantForm::class,
+        'slide-overs.generate-variants' => Livewire\SlideOvers\GenerateVariants::class,
         'slide-overs.attribute-form' => Livewire\SlideOvers\AttributeForm::class,
+        'slide-overs.choose-product-attributes' => Livewire\SlideOvers\ChooseProductAttributes::class,
         'slide-overs.attribute-values' => Livewire\SlideOvers\AttributeValues::class,
+        'slide-overs.manage-pricing' => Livewire\SlideOvers\ManagePricing::class,
     ],
 
 ];

packages/admin/config/components/setting.php

@@ -17,9 +17,9 @@
     'pages' => [
         'setting-index' => Pages\Settings\Index::class,
         'general' => Pages\Settings\General::class,
-        'inventory-index' => Pages\Settings\Inventories\Browse::class,
-        'inventory-create' => Pages\Settings\Inventories\Create::class,
-        'inventory-edit' => Pages\Settings\Inventories\Edit::class,
+        'location-index' => Pages\Settings\Locations\Index::class,
+        'location-create' => Pages\Settings\Locations\Create::class,
+        'location-edit' => Pages\Settings\Locations\Edit::class,
         'legal' => Pages\Settings\LegalPage::class,
         'payment' => Pages\Settings\Payment::class,
         'team-index' => Pages\Settings\Team\Index::class,
@@ -40,7 +40,7 @@
         'modals.logout-others-browser' => Livewire\Modals\LogoutOthersBrowser::class,
         'modals.payment-method-form' => Livewire\Modals\PaymentMethodForm::class,
 
-        'settings.inventories.form' => Components\Settings\Inventories\InventoryForm::class,
+        'settings.locations.form' => Components\Settings\Locations\InventoryForm::class,
         'settings.legal.privacy' => Components\Settings\Legal\Privacy::class,
         'settings.legal.refund' => Components\Settings\Legal\Refund::class,
         'settings.legal.shipping' => Components\Settings\Legal\Shipping::class,

packages/admin/config/settings.php

@@ -35,16 +35,9 @@
             'name' => 'shopper::pages/settings/menu.location',
             'description' => 'shopper::pages/settings/menu.location_description',
             'icon' => 'untitledui-marker-pin-flag',
-            'route' => 'shopper.settings.inventories',
+            'route' => 'shopper.settings.locations',
             'permission' => null,
         ],
-        //        [
-        //            'name' => 'shopper::pages/settings/menu.analytic',
-        //            'description' => 'shopper::pages/settings/menu.analytic_description',
-        //            'icon' => 'untitledui-pie-chart',
-        //            'route' => 'shopper.settings.analytics',
-        //            'permission' => null,
-        //        ],
         [
             'name' => 'shopper::pages/settings/menu.payment',
             'description' => 'shopper::pages/settings/menu.payment_description',

packages/admin/docs/content/Initial-setup.md

@@ -144,7 +144,7 @@ return [
     'pages' => [
         'setting-index' => Pages\Settings\Index::class,
         'general' => Pages\Settings\General::class, // [tl! focus]
-        'inventory-index' => Pages\Settings\Inventories\Browse::class,
+        'inventory-index' => Pages\Settings\Locations\Index::class,
         // ...
     ];
 

packages/admin/docs/content/locations.md

@@ -59,9 +59,9 @@ return [
 
     'pages' => [
         // ...
-        'inventory-index' => Pages\Settings\Inventories\Browse::class,
-        'inventory-create' => Pages\Settings\Inventories\Create::class,
-        'inventory-edit' => Pages\Settings\Inventories\Edit::class,
+        'inventory-index' => Pages\Settings\Locations\Index::class,
+        'inventory-create' => Pages\Settings\Locations\Create::class,
+        'inventory-edit' => Pages\Settings\Locations\Edit::class,
         // ...
     ];
 

packages/admin/resources/lang/en/forms.php

@@ -13,6 +13,7 @@
         'remember' => 'Remember me',
         'change' => 'Change',
         'optional' => 'Optional',
+        'summary' => 'Summary',
         'description' => 'Description',
         'title' => 'Title',
         'confirm' => 'Confirm',
@@ -21,6 +22,7 @@
         'full_name' => 'Full Name',
         'phone_number' => 'Phone number',
         'name' => 'Name',
+        'external_id' => 'Product external Id',
         'slug' => 'Slug',
         'website' => 'Website',
         'url' => 'Url',
@@ -117,6 +119,8 @@
         'pixel_id' => 'Your Facebook Pixel account ID',
         'icon' => 'Icon',
         'thumbnail' => 'Thumbnail',
+        'attribute' => 'Attribute',
+        'attribute_custom_value' => 'Custom value (for text input field)',
     ],
 
     'placeholder' => [

packages/admin/resources/lang/en/notifications.php

@@ -14,6 +14,7 @@
     'approved' => ':item has successfully approved',
     'disapproved' => ':item has successfully disapproved',
     'visibility' => ':item has successfully updated visibility',
+    'saved' => 'Saved',
 
     'auth' => [
         'password' => 'This password does not match our records.',

packages/admin/resources/lang/en/pages/products.php

@@ -11,7 +11,9 @@
     'about_pricing' => 'About pricing display',
     'about_pricing_content' => 'All prices are in cents by default. To save 10€ (or 10$) you must enter 1000 cents for the currency formatting to be correct.',
 
-    'cost_per_items_help_text' => 'Customers won’t see this.',
+    'amount_price_help_text' => 'Purchase price, before discounts.',
+    'compare_price_help_text' => 'Recommended sell price, for comparison with purchase price. This price is more often higher',
+    'cost_per_items_help_text' => 'The original manufacturing price. Customers won\'t see it',
     'safety_security_help_text' => 'The safety stock is the limit stock for your products which alerts you if the product stock will soon be out of stock.',
     'quantity_inventory' => 'Quantity Inventory',
     'manage_inventories' => 'Manage Inventories',
@@ -20,20 +22,26 @@
     'product_can_returned_help_text' => 'Users have the option of returning this product if there is a problem or dissatisfaction.',
     'product_shipped' => 'This product will be shipped',
     'product_shipped_help_text' => 'Reassure to fill in the information concerning the shipment of the product.',
-    'status' => 'Product status',
+    'general' => 'Product information',
+    'status' => 'Product availability',
     'visible_help_text' => 'This product will be hidden from all sales channels.',
     'availability_description' => 'Specify a publication date so that your product are scheduled on your store.',
+    'type' => 'Product type',
+    'product_type' => 'Set as default product type',
+    'product_type_helpText' => 'This configuration will be saved for the next products you create.',
     'product_associations' => 'Associations',
     'related_products' => 'Related Products',
     'quantity_available' => 'Quantity Available',
     'current_qty_inventory' => 'Current quantity on this inventory',
     'stock_inventory_heading' => 'Stock & Inventory',
     'stock_inventory_description' => 'Configure the inventory and stock for this :item',
+    'files_helpText' => 'Add the files that will be downloadable with the purchase of this product.',
     'images_helpText' => 'Add images to your product.',
     'variant_images_helpText' => 'Add images to your variant.',
     'thumbnail_helpText' => 'Used to represent your product during checkout, social sharing and more.',
     'weight_dimension' => 'Weight and Dimension',
     'weight_dimension_help_text' => 'Used to calculate shipping charges during checkout and to label prices during order processing.',
+    'external_id_description' => 'The original identifier of your product from the external supplier',
 
     'modals' => [
         'title' => 'Delete this :item',
@@ -51,6 +59,8 @@
         'title' => 'Products variations',
         'description' => 'All variations of your product. The variations can each have their stock and price.',
         'add' => 'Add variant',
+        'generate' => 'Generate variants',
+        'generate_description' => 'Your products are generated according to the attributes you have selected',
         'variant_title' => 'Variants ~ :name',
         'empty' => 'No variant found',
         'search_label' => 'Search variant',
@@ -91,7 +101,7 @@
     'attributes' => [
         'title' => 'Product Attributes',
         'description' => 'All the attributes associated with this product.',
-        'add' => 'Add attribute',
+        'choose' => 'Choose attributes',
         'empty_title' => 'No enabled Attributes',
         'empty_values' => 'The attributes associated with this product are listed here.',
 
@@ -101,7 +111,7 @@
             'delete_value' => 'Attribute value removed',
             'delete_value_message' => 'You have successfully removed the value of this attribute!',
             'added' => 'Attribute Added',
-            'added_message' => 'You have successfully added an attribute to this product!',
+            'added_message' => 'You have successfully added attributes to this product!',
         ],
     ],
 
@@ -140,16 +150,26 @@
     ],
 
     'notifications' => [
+        'files_update' => 'Product files updated!',
         'media_update' => 'Product media updated!',
         'replicated' => 'Product replicated!',
         'stock_update' => 'Product Stock successfully updated!',
         'seo_update' => 'Product SEO successfully updated!',
         'shipping_update' => 'Product shipping successfully updated!',
+        'variation_generate' => 'Product Variants successfully saved',
         'variation_create' => 'Product variation successfully added!',
         'variation_delete' => 'The variation has successfully removed!',
         'variation_update' => 'Variant successfully updated!',
         'related_added' => 'The product has successfully added to the related products!',
         'remove_related' => 'The product has successfully removed from the related products!',
+        'manage_pricing' => 'Your product pricing has been updated!',
+    ],
+
+    'pricing' => [
+        'title' => 'Product pricing',
+        'description' => 'The different prices associated with your product. This depends on the currencies you have in your store.',
+        'add' => 'Add new price',
+        'empty' => 'No product pricing added',
     ],
 
 ];

packages/admin/resources/lang/en/pages/settings/carriers.php

@@ -5,5 +5,6 @@
 return [
 
     'title' => 'Delivery methods',
+    'single' => 'Delivery method',
 
 ];

packages/admin/resources/lang/en/pages/settings/channels.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+return [
+
+    'title' => 'Sales channels',
+    'single' => 'Sales channel',
+
+];

packages/admin/resources/lang/en/pages/settings/global.php

@@ -27,18 +27,18 @@
     ],
 
     'location' => [
-        'menu' => 'Inventories',
-        'single' => 'inventory',
+        'menu' => 'Locations',
+        'single' => 'location',
         'description' => 'Manage the places you stock inventory, fulfill orders, and sell products.',
-        'count' => 'You’re using :count of the :total available inventories.',
-        'add' => 'Add Inventory',
+        'count' => 'You’re using :count of the :total available locations.',
+        'add' => 'Add location',
         'detail' => 'Details',
         'detail_summary' => 'Give this location a short name to make it easy to identify. You’ll see this name in areas like products.',
-        'address' => 'Inventory address',
-        'address_summary' => "Your inventory's complete information. Please put valide informations this can be accessible for your customers.",
-        'set_default' => 'Set as default inventory',
+        'address' => 'Location address',
+        'address_summary' => "Your location's complete information. Please put valide informations this can be accessible for your customers.",
+        'set_default' => 'Set as default location',
         'set_default_summary' => 'Inventory at this location is available for sale online and will use as default',
-        'is_default' => 'This is your default inventory. To change whether you fulfill online orders from this inventory, select another default inventory first.',
+        'is_default' => 'This is your default location. To change whether you fulfill online orders from this location, select another default location first.',
     ],
 
     'analytics' => [

packages/admin/resources/lang/en/pages/settings/menu.php

@@ -20,5 +20,7 @@
     'zone_description' => 'Manage shipping, payment, and fulfillment across zones',
     'tax' => 'Taxes',
     'tax_description' => 'Manage how your store charges taxes.',
+    'sales' => 'Sales channels',
+    'sales_description' => 'Manage the online and offline channels you sell products on.',
 
 ];

packages/admin/resources/lang/en/words.php

@@ -79,6 +79,7 @@
         'customers' => 'For :count customers',
     ],
 
+    'files' => 'Files',
     'images' => 'Images',
     'step' => 'Step :number',
     'environment' => 'Environnement',

packages/admin/resources/lang/fr/forms.php

@@ -13,6 +13,7 @@
         'remember' => 'Se souvenir de moi',
         'change' => 'Changer',
         'optional' => 'Optionnel',
+        'summary' => 'Résumé',
         'description' => 'Description',
         'title' => 'Titre',
         'confirm' => 'Confirmer',
@@ -21,6 +22,7 @@
         'full_name' => 'Nom complet',
         'phone_number' => 'Numéro de téléphone',
         'name' => 'Nom',
+        'external_id' => 'Id Externe du produit',
         'slug' => 'Slug',
         'website' => 'Site web',
         'url' => 'Url',
@@ -117,6 +119,8 @@
         'pixel_id' => 'ID du compte Facebook Pixel',
         'icon' => 'Icône',
         'thumbnail' => 'Miniature',
+        'attribute' => 'Attribut',
+        'attribute_custom_value' => 'Valeur personnalisée (pour les champs texte)',
     ],
 
     'placeholder' => [

packages/admin/resources/lang/fr/notifications.php

@@ -14,6 +14,7 @@
     'approved' => ':item approuvé(e) avec succès',
     'disapproved' => ':item désapprouvé(e) avec succès',
     'visibility' => 'Visibilité pour :item a été modifiée avec succès',
+    'saved' => 'Enregistré',
 
     'attributes' => [
         'remove' => 'L\'attribut a été supprimé avec succès',