Fixes for upgrade file

Sylius · Dec 30, 2020 · 25e6ecf · 25e6ecf
1 parent c5dc090
commit 25e6ecf
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 78 deletions.
diff --git a/UPGRADE-1.8.md b/UPGRADE-1.8.md
@@ -8,13 +8,26 @@ If you are using they on your custom entity `api_resource` configuration or seri
     `admin_user:read` changed to: `admin:admin_user:read`
     `admin_user:update` changed to: `admin:admin_user:update`
     `avatar_image:read` changed to: `admin:avatar_image:read`
+    `cart:add_item` changed to: `shop:cart:add_item`
+    `cart:address` changed to: `shop:cart:address`
+    `cart:apply_coupon` changed to: `shop:cart:apply_coupon`
+    `cart:change_quantity` changed to: `shop:cart:change_quantity`
+    `cart:complete` changed to: `shop:cart:complete`
+    `cart:remove_item` changed to: `shop:cart:remove_item`
+    `cart:select_payment_method` changed to: `shop:cart:select_payment_method`
+    `cart:select_shipping_method` changed to: `shop:cart:select_shipping_method`
+    `cart:update` changed to: `shop:cart:update`
     `channel:create` changed to: `admin:channel:create`
     `channel:read` changed to: `admin:channel:read`
+    `checkout:read` changed to: `shop:cart:read`
     `country:read` changed to: `admin:country:read`
     `currency:read` changed to: `admin:currency:read`
     `customer:password:write` changed to: `shop:customer:password:update`
     `customer:read` changed to: `admin:customer:read` and `shop:customer:read`
     `customer:update` changed to: `shop:customer:update`
+    `order:create` changed to: `shop:order:create`
+    `order:read` changed to: `admin:order:read`
+    `order:update` changed to: `admin:order:update`
     `shop:currencies:read` changed to: `shop:currency:read`
     `shop:customer:write` changed to: `shop:customer:create`
 

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/Order.xml
@@ -107,7 +107,7 @@
                     <attribute name="groups">shop:cart:address</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:checkout:read</attribute>
+                    <attribute name="groups">shop:cart:read</attribute>
                 </attribute>
                 <attribute name="openapi_context">
                     <attribute name="summary">Addresses cart to given location, logged in Customer does not have to provide an email</attribute>
@@ -127,7 +127,7 @@
                     <attribute name="groups">shop:cart:select_shipping_method</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:checkout:read</attribute>
+                    <attribute name="groups">shop:cart:read</attribute>
                 </attribute>
                 <attribute name="openapi_context">
                     <attribute name="summary">Selects shipping methods for particular shipment</attribute>
@@ -161,7 +161,7 @@
                     <attribute name="groups">shop:cart:select_payment_method</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:checkout:read</attribute>
+                    <attribute name="groups">shop:cart:read</attribute>
                 </attribute>
                 <attribute name="openapi_context">
                     <attribute name="summary">Selects payment methods for particular payment</attribute>
@@ -260,7 +260,7 @@
                     <attribute name="groups">shop:cart:complete</attribute>
                 </attribute>
                 <attribute name="normalization_context">
-                    <attribute name="groups">shop:checkout:read</attribute>
+                    <attribute name="groups">shop:cart:read</attribute>
                 </attribute>
                 <attribute name="openapi_context">
                     <attribute name="summary">Completes checkout</attribute>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Address.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Address.xml
@@ -27,21 +27,21 @@
         </attribute>
         <attribute name="firstName">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="lastName">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="phoneNumber">
             <group>admin:address:read</group>
@@ -55,56 +55,56 @@
         </attribute>
         <attribute name="city">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="street">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="postcode">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="countryCode">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="provinceCode">
             <group>admin:address:read</group>
             <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
         <attribute name="provinceName">
             <group>admin:address:read</group>
-            <group>shop:address:read</group>
-            <group>shop:order:account:read</group>
-            <group>shop:cart:address</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:address:read</group>
             <group>shop:address:update</group>
+            <group>shop:cart:address</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Order.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Order.xml
@@ -17,22 +17,22 @@
 >
     <class name="Sylius\Component\Core\Model\Order">
         <attribute name="id">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
             <group>shop:order:read</group>
         </attribute>
 
         <attribute name="number">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
             <group>shop:order:read</group>
         </attribute>
 
         <attribute name="currencyCode">
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
 
         <attribute name="channel">
@@ -44,21 +44,21 @@
         </attribute>
 
         <attribute name="payments">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="shipments">
             <group>shop:order:account:read</group>
+            <group>shop:cart:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
         </attribute>
 
         <attribute name="checkoutState">
             <group>shop:order:account:read</group>
+            <group>shop:cart:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
         </attribute>
 
         <attribute name="state">
@@ -74,64 +74,63 @@
         </attribute>
 
         <attribute name="total">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="orderPromotionTotal">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="tokenValue">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
             <group>shop:order:read</group>
         </attribute>
 
         <attribute name="items">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="notes">
             <group>admin:order:read</group>
         </attribute>
 
         <attribute name="taxTotal">
-            <group>shop:order:account:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="localeCode">
-            <group>shop:order:account:read</group>
-            <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
             <group>admin:cart:update</group>
             <group>admin:order:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="shippingTotal">
-            <group>shop:order:account:read</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="shippingAddress">
-            <group>shop:order:account:read</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
 
         <attribute name="billingAddress">
-            <group>shop:order:account:read</group>
-            <group>shop:checkout:read</group>
             <group>admin:order:read</group>
+            <group>shop:cart:read</group>
+            <group>shop:order:account:read</group>
         </attribute>
     </class>
 </serializer>
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItem.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/OrderItem.xml
@@ -20,7 +20,7 @@
             <group>shop:order:account:read</group>
             <group>order_item:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="code">
             <group>order_item:read</group>
@@ -33,13 +33,13 @@
             <group>shop:order:account:read</group>
             <group>order_item:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="quantity">
             <group>shop:order:account:read</group>
             <group>order_item:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="unitPrice">
             <group>order_item:read</group>
@@ -65,7 +65,7 @@
         <attribute name="productName">
             <group>shop:order:account:read</group>
             <group>order_item:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
             <group>admin:order:read</group>
         </attribute>
         <attribute name="subtotal">

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Payment.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/Payment.xml
@@ -19,13 +19,13 @@
         <attribute name="id">
             <group>payment:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="method">
             <group>shop:order:account:read</group>
             <group>payment:read</group>
             <group>admin:order:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="currencyCode">
             <group>payment:read</group>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/PaymentMethod.xml
@@ -23,7 +23,7 @@
             <group>shop:order:account:read</group>
             <group>payment_method:read</group>
             <group>payment:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
         <attribute name="code">
             <group>payment_method:read</group>

diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/ProductVariant.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/serialization/ProductVariant.xml
@@ -28,7 +28,7 @@
         <attribute name="translations">
             <group>shop:order:account:read</group>
             <group>product_variant:read</group>
-            <group>shop:checkout:read</group>
+            <group>shop:cart:read</group>
         </attribute>
     </class>
 </serializer>