spree_api 3.7.3 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8699f7a4fd86c5f95a9f1a14df650c232f133cabb1c3ef9c671ffaffda57a428
-  data.tar.gz: 7c94139485eceb5d332606589da8d46b23fc92e12d806e86c0e1476c52a13aff
+  metadata.gz: 89321cbba6d2a536bc10bdc0f5ec6606c298d0a0dc416732bba649804d2c0b60
+  data.tar.gz: cec9aa0ad43caf9a351be34395130cb53c7d288c9895efef698d24018a5af91c
 SHA512:
-  metadata.gz: fd2fac5a6f916634e3e7b3bf01588ac85fc82b424a4ecd5d0861c0615746fb70d3d3e492494d4a7cf9b0a24eb16f2d56e83b244a1676d3acf849a0913a58f4b4
-  data.tar.gz: 513dc4c202e1ade87be1f9414c10688b2cfd74a30ca8a66ec83ca7a127727b90e96841c1276b68bd166ff8b7ef7c7e742bbf0dc16919f637f0283371b77bfee8
+  metadata.gz: f1c7bd0a834493213eda8232b1420ec076020b511d65ccdcfc0306d11d34b343fd55adff1b842a823644f5806ee7e141f5fb0dadad8430bb63407c6c72753153
+  data.tar.gz: 4ea46ad49d205de2473192924bcc64d0c439d1e2c103ec36e37abc378a33a1a3aa554b484d01138a2ad926815976c0909e93c56cc199facb9be7e0b2dc0bd103

data/app/controllers/spree/api/v2/storefront/cart_controller.rb

@@ -90,20 +90,16 @@ module Spree
           def remove_coupon_code
             spree_authorize! :update, spree_current_order, order_token
 
-            coupon_code = if params[:coupon_code].present?
-                            params[:coupon_code]
-                          else
-                            spree_current_order.promotions.coupons.first&.code
-                          end
+            coupon_codes = select_coupon_codes
 
-            return render_error_payload(Spree.t('v2.cart.no_coupon_code', scope: 'api')) if coupon_code.nil?
+            return render_error_payload(Spree.t('v2.cart.no_coupon_code', scope: 'api')) if coupon_codes.empty?
 
-            result = coupon_handler.new(spree_current_order).remove(coupon_code)
+            result_errors = coupon_codes.count > 1 ? select_errors(coupon_codes) : select_error(coupon_codes)
 
-            if result.error.blank?
+            if result_errors.blank?
               render_serialized_payload { serialized_current_order }
             else
-              render_error_payload(result.error)
+              render_error_payload(result_errors)
             end
           end
 
@@ -167,6 +163,28 @@ module Spree
               params: { currency: spree_current_order.currency }
             ).serializable_hash
           end
+
+          def select_coupon_codes
+            params[:coupon_code].present? ? [params[:coupon_code]] : check_coupon_codes
+          end
+
+          def check_coupon_codes
+            spree_current_order.promotions.coupons.map(&:code)
+          end
+
+          def select_error(coupon_codes)
+            result = coupon_handler.new(spree_current_order).remove(coupon_codes.first)
+            result.error
+          end
+
+          def select_errors(coupon_codes)
+            results = []
+            coupon_codes.each do |coupon_code|
+              results << coupon_handler.new(spree_current_order).remove(coupon_code)
+            end
+
+            results.select(&:error)
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.7.3
+  version: 3.7.4
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: 3.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: 3.7.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement