spree_backend 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e5508c1e6162bbbfd4ef16977be9cbc9270f1c4
-  data.tar.gz: 4dd10a908bc145ea65564b4fd9d2ab1284e6fa98
+  metadata.gz: 8295ae5ec9ae0ddb43d6fb2a00fd2728d2bada0a
+  data.tar.gz: 93a99d51c0ecdfd0bc93363b02360e1386057f10
 SHA512:
-  metadata.gz: 013d4b32776f0e76d02b7ebaebeabd8aca422f7d6e0c0d4be77ccb30aebff372ebcbfd67668e5c6d7390afb60779892de4ac5c88e0e024066026ca341b58be4e
-  data.tar.gz: 2989e5377557f6b2ac1b1ecd5e91efd8dd826d629a75200afc960220d5cab2736eb4b281f429fd692e388bf811df2b27fe60fb8e0bec10a7e47f211873e601dd
+  metadata.gz: c4d10444fb2891b7e46e4c38f437bb39cf03f64ffb6bc9a8aac256f30470e07a8e87711671cd64eb3b93960a55ee3f41b997e6839c41be6403ea13e441695227
+  data.tar.gz: 6ae66b4e2e07953cd0ee68db276052b5d31ddc683474004a6daee9b5f4c913fe4383a9fef8a4b0e569f38f1bc3b6c1efb23614b772ac66b87bbb26d141b468bd

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -23,14 +23,16 @@
         <div class="col-md-4">
           <div class="form-group">
             <strong><%= label_tag nil, Spree.t(:guest_checkout) %></strong>
+            <% guest = @order.user.nil? %>
+
             <% if @order.completed? %>
               <div>
                 <span class="badge">
-                  <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+                  <%= guest ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+                  <%= hidden_field_tag :guest_checkout, guest %>
                 </span>
               </div>
             <% else %>
-              <% guest = @order.user.nil? %>
               <div class="radio no-margint">
                 <%= label_tag :guest_checkout_true do %>
                   <%= radio_button_tag :guest_checkout, true, guest %>

data/app/views/spree/admin/products/_form.html.erb

@@ -111,28 +111,28 @@
           <div class="col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
               <%= f.label :weight, Spree.t(:weight) %>
-              <%= f.text_field :weight, size: 4, class: 'form-control' %>
+              <%= f.text_field :weight, value: number_with_precision(@product.weight, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
           <div class="col-md-6">
             <div id="shipping_specs_height_field" data-hook="admin_product_form_height" class="form-group">
               <%= f.label :height, Spree.t(:height) %>
-              <%= f.text_field :height, size: 4, class: 'form-control' %>
+              <%= f.text_field :height, value: number_with_precision(@product.height, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
           <div class="col-md-6">
             <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="form-group">
               <%= f.label :width, Spree.t(:width) %>
-              <%= f.text_field :width, size: 4, class: 'form-control' %>
+              <%= f.text_field :width, value: number_with_precision(@product.width, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
           <div class="col-md-6">
             <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="form-group">
               <%= f.label :depth, Spree.t(:depth) %>
-              <%= f.text_field :depth, size: 4, class: 'form-control' %>
+              <%= f.text_field :depth, value: number_with_precision(@product.depth, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
         </div>

data/spec/features/admin/products/products_spec.rb

@@ -334,6 +334,55 @@ describe "Products", type: :feature do
           expect(first('input[type=text]').value).to eq('baseball_cap_color')
         end
       end
+
+      context "using a locale with a different decimal format" do
+        before do
+          # change English locale’s separator and delimiter to match 19,99 format
+          I18n.backend.store_translations(
+            :en,
+            number: {
+              currency: {
+                format: {
+                  separator: ",",
+                  delimiter: "."
+                }
+              },
+              format: {
+                separator: ",",
+                delimiter: "."
+              }
+            }
+          )
+        end
+
+        after do
+          # revert changes to English locale
+          I18n.backend.store_translations(
+            :en,
+            number: {
+              currency: {
+                format: {
+                  separator: ".",
+                  delimiter: ","
+                }
+              },
+              format: {
+                separator: ".",
+                delimiter: ","
+              }
+            }
+          )
+        end
+
+        it 'should parse correctly decimal values like weight' do
+          visit spree.admin_product_path(product)
+          fill_in 'product_weight', with: '1'
+          click_button 'Update'
+          weight_prev = find('#product_weight').value
+          click_button 'Update'
+          expect(find('#product_weight').value).to eq(weight_prev)
+        end
+      end
     end
 
     context 'deleting a product', :js => true do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-03-14 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.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -649,7 +649,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.