Merge branch '1.x' into patch-1

lunarphp · Oct 8, 2024 · 209a964 · 209a964
2 parents abfdeb5 + 3d66fb2
commit 209a964
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 <p align="center"><a href="https://lunarphp.io/" target="_blank"><picture><source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/lunarphp/art/main/lunar-logo-dark.svg"><img alt="Lunar" width="200" src="https://raw.githubusercontent.com/lunarphp/art/main/lunar-logo.svg"></picture></a></p>
 
 > [!CAUTION]
-> Version 1.x is currently in alpha release. We recommend this version for new projects, however, it is not feature-complete and therefore may not be deemed production-ready.
+> Version 1.x is currently in beta release. We recommend this version for new projects, however, it is not feature-complete and therefore may not be deemed production-ready.
 
 
 [Lunar](https://lunarphp.io) is a set of Laravel packages that bring functionality akin to Shopify and other e-commerce platforms to 

diff --git a/docs/admin/overview.md b/docs/admin/overview.md
@@ -1,8 +1,8 @@
 # Introduction
 
-::: danger Alpha Release
+::: danger Beta Release
 Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
-use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
+use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
 :::
 
 Lunar's admin panel is powered by Filament v3. It allows you to easily extend the admin panel to suit your project.

diff --git a/docs/core/installation.md b/docs/core/installation.md
@@ -1,8 +1,8 @@
 # Installation
 
-::: danger Alpha Release
+::: danger Beta Release
 Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
-use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
+use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
 :::
 
 ## Requirements
@@ -20,7 +20,7 @@ use and should exercise the same amount of caution as you would with any softwar
 ### Composer Require Package
 
 ```sh
-composer require lunarphp/lunar:"^1.0.0-alpha" -W
+composer require lunarphp/lunar:"^1.0.0-beta" -W
 ```
 
 ::: tip

diff --git a/docs/core/overview.md b/docs/core/overview.md
@@ -1,8 +1,8 @@
 # Welcome to Lunar!
 
-::: danger Alpha Release
-Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own 
-use and should exercise the same amount of caution as you would with any software in an alpha state. 🚀
+::: danger Beta Release
+Although many Lunar sites have been launched using v1.x, you may not consider this version production-ready for your own
+use and should exercise the same amount of caution as you would with any software in an beta state. 🚀
 :::
 
 We are delighted you are considering Lunar for your project. We've spent a lot of time developing this package to bring headless e-commerce functionality to Laravel.

diff --git a/docs/core/reference/carts.md b/docs/core/reference/carts.md
@@ -129,15 +129,6 @@ foreach ($cart->shippingBreakdown->items as $shippingBreakdown) {
 }
 
 
-foreach ($cart->discountBreakdown as $discountBreakdown) {
-    $discountBreakdown->discount_id
-    foreach ($discountBreakdown->lines as $discountLine) {
-        $discountLine->quantity
-        $discountLine->line
-    }
-    $discountBreakdown->total->value
-}
-
 foreach ($cart->discountBreakdown as $discountBreakdown) {
     $discountBreakdown->discount_id
     foreach ($discountBreakdown->lines as $discountLine) {

diff --git a/packages/core/src/LunarServiceProvider.php b/packages/core/src/LunarServiceProvider.php
@@ -95,6 +95,7 @@ class LunarServiceProvider extends ServiceProvider
         'cart',
         'cart_session',
         'database',
+        'discounts',
         'media',
         'orders',
         'payments',

diff --git a/packages/core/src/Pipelines/Cart/ApplyDiscounts.php b/packages/core/src/Pipelines/Cart/ApplyDiscounts.php
@@ -11,7 +11,7 @@ final class ApplyDiscounts
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @return mixed
      */
     public function handle(Cart $cart, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Cart/ApplyShipping.php b/packages/core/src/Pipelines/Cart/ApplyShipping.php
@@ -14,7 +14,7 @@ final class ApplyShipping
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @return mixed
      */
     public function handle(Cart $cart, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Cart/Calculate.php b/packages/core/src/Pipelines/Cart/Calculate.php
@@ -11,7 +11,7 @@ class Calculate
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @return mixed
      */
     public function handle(Cart $cart, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Cart/CalculateLines.php b/packages/core/src/Pipelines/Cart/CalculateLines.php
@@ -12,7 +12,7 @@ class CalculateLines
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @return mixed
      */
     public function handle(Cart $cart, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Cart/CalculateTax.php b/packages/core/src/Pipelines/Cart/CalculateTax.php
@@ -15,7 +15,7 @@ class CalculateTax
     /**
      * Called just before cart totals are calculated.
      *
-     * @return void
+     * @return mixed
      */
     public function handle(Cart $cart, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/CleanUpOrderLines.php b/packages/core/src/Pipelines/Order/Creation/CleanUpOrderLines.php
@@ -8,7 +8,7 @@
 class CleanUpOrderLines
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/CreateOrderAddresses.php b/packages/core/src/Pipelines/Order/Creation/CreateOrderAddresses.php
@@ -9,7 +9,7 @@
 class CreateOrderAddresses
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/CreateOrderLines.php b/packages/core/src/Pipelines/Order/Creation/CreateOrderLines.php
@@ -9,7 +9,7 @@
 class CreateOrderLines
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/CreateShippingLine.php b/packages/core/src/Pipelines/Order/Creation/CreateShippingLine.php
@@ -10,7 +10,7 @@
 class CreateShippingLine
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/FillOrderFromCart.php b/packages/core/src/Pipelines/Order/Creation/FillOrderFromCart.php
@@ -10,7 +10,7 @@
 class FillOrderFromCart
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {

diff --git a/packages/core/src/Pipelines/Order/Creation/MapDiscountBreakdown.php b/packages/core/src/Pipelines/Order/Creation/MapDiscountBreakdown.php
@@ -8,7 +8,7 @@
 class MapDiscountBreakdown
 {
     /**
-     * @return Closure
+     * @return mixed
      */
     public function handle(Order $order, Closure $next)
     {