Merge pull request #2017 from jhawthorn/stronger_spree_url_deprecation

Emit Spree.url deprecation warning in all envs
solidusio · Jun 15, 2017 · cf9eebd · cf9eebd
2 parents f0cabac + 6d1f959
commit cf9eebd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/app/assets/javascripts/spree.js.erb b/core/app/assets/javascripts/spree.js.erb
@@ -23,8 +23,8 @@ Spree.pathFor = function(path) {
 };
 
 Spree.url = function(uri, query) {
-  if (Spree.env === 'development' || Spree.env === 'test') {
-    console.warn('Spree.url is deprecated, please use Spree.ajax for your request instead.');
+  if (console && console.warn) {
+    console.warn('Spree.url is deprecated, and will be removed from a future Solidus version.');
   }
   if (uri.path === undefined) {
     uri = new Uri(uri);

diff --git a/frontend/app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee b/frontend/app/assets/javascripts/spree/frontend/checkout/coupon-code.js.coffee
@@ -6,18 +6,18 @@ Spree.onCouponCodeApply = (e) ->
   couponStatus = $("#coupon_status")
   successClass = 'success'
   errorClass = 'alert'
-  url = Spree.url(Spree.routes.apply_coupon_code(Spree.current_order_id),
-    {
-      order_token: Spree.current_order_token,
-      coupon_code: couponCode
-    }
-  )
 
   couponStatus.removeClass([successClass,errorClass].join(" "))
 
+  data =
+    order_token: Spree.current_order_token,
+    coupon_code: couponCode
+
   req = Spree.ajax
-    method: "PUT",
-    url: url
+    method: "PUT"
+    url: Spree.routes.apply_coupon_code(Spree.current_order_id)
+    data: JSON.stringify(data)
+    contentType: "application/json"
 
   req.done (data) ->
     window.location.reload()