spree_frontend 3.3.0.rc3 → 3.3.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cae9b2ff3fcd6fa11abcfdc743477e2dcd4eea4
-  data.tar.gz: b5de683c69681772147d7750bca160981dd7a8c0
+  metadata.gz: 4c7c9088d939b3b6aa4dae8ccd04f573a4ad118a
+  data.tar.gz: 567cdb222d2de2cfa619941144124733e761de7c
 SHA512:
-  metadata.gz: 4e397ef7b99b29e88e684acaa543715f0e19a2b66403e602ae031ae26a0601beb44afbaa76bfd32742c1320313821e61e15bfde54cfd9019102af9243fd2f49f
-  data.tar.gz: 72123bbdc4164fd371dd3fc867b346895fa0a68cce0b826938220a7aae61ae93bebf1a3e48eeb53ef6b9496c4aa76b23dacb5cd1c38fff5f0645c875ff1108e9
+  metadata.gz: e5363906ac5e584ad1170a308886428c5fbcd72397330aa7fd8f7d21da068e3946c073360ed76470f21bba0629c400e8d45fffc114d49f6c7750e1dc0e5cc3db
+  data.tar.gz: 4469e1eaa28d9a96ffcf7e4368f830949d8e9aaf374e2eaebf9e435de58c4ef75140c70c4c3c6a73b57c1bc278ac0e38b687dfb15510fcea275912982c643060

data/app/assets/javascripts/spree/frontend/checkout/shipment.js.coffee

@@ -1,10 +1,13 @@
 class @ShippingTotalManager
-  REGEX_FOR_REMOVING_SPECIAL_CHARS = /[^0-9\.]+/g
-
   constructor: (@input) ->
     @shippingMethods = @input.shippingMethods
     @shipmentTotal = @input.shipmentTotal
     @orderTotal = @input.orderTotal
+    @formatOptions = {
+      symbol : @shipmentTotal.data('currency'),
+      decimal : @shipmentTotal.attr('decimal-mark'),
+      thousand: @shipmentTotal.attr('thousands-separator'),
+      precision : 2 }
 
   calculateShipmentTotal: ->
     @sum = 0
@@ -18,12 +21,12 @@ class @ShippingTotalManager
     )
 
   parseCurrencyToFloat: (input) ->
-    parseFloat(input.replace(REGEX_FOR_REMOVING_SPECIAL_CHARS, ""))
+    accounting.unformat(input, @formatOptions.decimal)
 
   readjustSummarySection: (orderTotal, newShipmentTotal, oldShipmentTotal) ->
     newOrderTotal = orderTotal + (newShipmentTotal - oldShipmentTotal)
-    @shipmentTotal.html(@shipmentTotal.data('currency') + newShipmentTotal.toFixed(2))
-    @orderTotal.html(@orderTotal.data('currency') + newOrderTotal.toFixed(2))
+    @shipmentTotal.html(accounting.formatMoney(newShipmentTotal, @formatOptions))
+    @orderTotal.html(accounting.formatMoney(newOrderTotal, @formatOptions))
 
   bindEvent: ->
     @shippingMethods.change =>

data/app/helpers/spree/frontend_helper.rb

@@ -23,7 +23,7 @@ module Spree
     def checkout_progress(numbers: false)
       states = @order.checkout_steps
       items = states.each_with_index.map do |state, i|
-        text = Spree.t("order_states.#{state}").titleize
+        text = Spree.t("order_state.#{state}").titleize
         text.prepend("#{i.succ}. ") if numbers
 
         css_classes = []

data/app/views/spree/checkout/_summary.html.erb

@@ -30,7 +30,8 @@
     <% if order.passed_checkout_step?("address") && order.shipments.any? %>
       <tr data-hook="shipping_total">
         <td><%= Spree.t(:shipping_total) %>:</td>
-        <td data-hook='shipping-total' data-currency=<%= Money::Currency.find(order.currency).symbol %>><%= Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency).to_html %></td>
+        <% shipping_total = Spree::Money.new(order.shipments.to_a.sum(&:cost), currency: order.currency) %>
+        <td data-hook='shipping-total' data-currency='<%= Money::Currency.find(order.currency).symbol %>' thousands-separator='<%= shipping_total.thousands_separator %>' decimal-mark='<%= shipping_total.decimal_mark %>'><%= shipping_total.to_html %></td>
       </tr>
 
       <% if order.shipment_adjustments.nonzero.exists? %>

data/vendor/assets/javascripts/accounting.min.js

@@ -0,0 +1,4 @@
+/*!
+ * accounting.js v0.4.2, copyright 2014 Open Exchange Rates, MIT license, http://openexchangerates.github.io/accounting.js
+ */
+(function(p,z){function q(a){return!!(""===a||a&&a.charCodeAt&&a.substr)}function m(a){return u?u(a):"[object Array]"===v.call(a)}function r(a){return"[object Object]"===v.call(a)}function s(a,b){var d,a=a||{},b=b||{};for(d in b)b.hasOwnProperty(d)&&null==a[d]&&(a[d]=b[d]);return a}function j(a,b,d){var c=[],e,h;if(!a)return c;if(w&&a.map===w)return a.map(b,d);for(e=0,h=a.length;e<h;e++)c[e]=b.call(d,a[e],e,a);return c}function n(a,b){a=Math.round(Math.abs(a));return isNaN(a)?b:a}function x(a){var b=c.settings.currency.format;"function"===typeof a&&(a=a());return q(a)&&a.match("%v")?{pos:a,neg:a.replace("-","").replace("%v","-%v"),zero:a}:!a||!a.pos||!a.pos.match("%v")?!q(b)?b:c.settings.currency.format={pos:b,neg:b.replace("%v","-%v"),zero:b}:a}var c={version:"0.4.1",settings:{currency:{symbol:"$",format:"%s%v",decimal:".",thousand:",",precision:2,grouping:3},number:{precision:0,grouping:3,thousand:",",decimal:"."}}},w=Array.prototype.map,u=Array.isArray,v=Object.prototype.toString,o=c.unformat=c.parse=function(a,b){if(m(a))return j(a,function(a){return o(a,b)});a=a||0;if("number"===typeof a)return a;var b=b||".",c=RegExp("[^0-9-"+b+"]",["g"]),c=parseFloat((""+a).replace(/\((.*)\)/,"-$1").replace(c,"").replace(b,"."));return!isNaN(c)?c:0},y=c.toFixed=function(a,b){var b=n(b,c.settings.number.precision),d=Math.pow(10,b);return(Math.round(c.unformat(a)*d)/d).toFixed(b)},t=c.formatNumber=c.format=function(a,b,d,i){if(m(a))return j(a,function(a){return t(a,b,d,i)});var a=o(a),e=s(r(b)?b:{precision:b,thousand:d,decimal:i},c.settings.number),h=n(e.precision),f=0>a?"-":"",g=parseInt(y(Math.abs(a||0),h),10)+"",l=3<g.length?g.length%3:0;return f+(l?g.substr(0,l)+e.thousand:"")+g.substr(l).replace(/(\d{3})(?=\d)/g,"$1"+e.thousand)+(h?e.decimal+y(Math.abs(a),h).split(".")[1]:"")},A=c.formatMoney=function(a,b,d,i,e,h){if(m(a))return j(a,function(a){return A(a,b,d,i,e,h)});var a=o(a),f=s(r(b)?b:{symbol:b,precision:d,thousand:i,decimal:e,format:h},c.settings.currency),g=x(f.format);return(0<a?g.pos:0>a?g.neg:g.zero).replace("%s",f.symbol).replace("%v",t(Math.abs(a),n(f.precision),f.thousand,f.decimal))};c.formatColumn=function(a,b,d,i,e,h){if(!a)return[];var f=s(r(b)?b:{symbol:b,precision:d,thousand:i,decimal:e,format:h},c.settings.currency),g=x(f.format),l=g.pos.indexOf("%s")<g.pos.indexOf("%v")?!0:!1,k=0,a=j(a,function(a){if(m(a))return c.formatColumn(a,f);a=o(a);a=(0<a?g.pos:0>a?g.neg:g.zero).replace("%s",f.symbol).replace("%v",t(Math.abs(a),n(f.precision),f.thousand,f.decimal));if(a.length>k)k=a.length;return a});return j(a,function(a){return q(a)&&a.length<k?l?a.replace(f.symbol,f.symbol+Array(k-a.length+1).join(" ")):Array(k-a.length+1).join(" ")+a:a})};if("undefined"!==typeof exports){if("undefined"!==typeof module&&module.exports)exports=module.exports=c;exports.accounting=c}else"function"===typeof define&&define.amd?define([],function(){return c}):(c.noConflict=function(a){return function(){p.accounting=a;c.noConflict=z;return c}}(p.accounting),p.accounting=c)})(this);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_frontend
 version: !ruby/object:Gem::Version
-  version: 3.3.0.rc3
+  version: 3.3.0.rc4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc3
+        version: 3.3.0.rc4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -230,6 +230,7 @@ files:
 - lib/spree_frontend.rb
 - script/rails
 - spree_frontend.gemspec
+- vendor/assets/javascripts/accounting.min.js
 homepage: https://spreecommerce.com
 licenses:
 - BSD-3-Clause
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Frontend e-commerce functionality for the Spree project.