caboose-store 0.0.35 → 0.0.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjI4Zjc2ZWUzNzFkMDUzZDVlNTNmODk5NDNjYTY1NzhhMmFiZGFlZA==
+    MTU2YzBkNGJlOTQ1NmM1OTkwYTExNmQ5ZDNlOWEyY2IwYzUwMmNmYg==
   data.tar.gz: !binary |-
-    ZTRmOGFmODVhODY5YzgzNmNjOWE1NzRmY2Y2ZDJjNmNkYmUxMWQ2Yw==
+    NzUwNTdhOTEzMzIxYzMyNzUzNzBkYWFkOWU1ZTYyODI0NGMzNDkyMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTA2YWRkNTQ2ZjNiNTI4ODM3MTgxN2MzZTMzNGMxNzhkZDI1ZGI0ZGRhMDJk
-    NDY3NjcwMWY4ZmMwM2JmOGU3YTUwNTQ4OThjNzkyMGNhYzI4OGIwMDYyNTdk
-    MzQzOWYxYzAzNWFlMjk0ZDYwZjI1YjcwN2YxNDQxZTliY2YwODI=
+    MmQ4ZTIzNTE0YjJiMzBmMjgxNGY4NTA2NTM4MjBmNzYzNzc3NDQxYmI2ZTI5
+    YTg5NDg1YTg2MWMxODY2ZTk2NGJmOTRiYTIyZDExNWZiMWZkNDI2ODhjNmE0
+    Zjc4ZDVkYWRjYzQyMWI0MDZhYWFlNmExNDEwMmJmM2JiZWY2ZDA=
   data.tar.gz: !binary |-
-    YjczYmIzM2M1Y2IzOTFjMTVkZDcxNTk2NTFlMGFiMjc4Y2YwYjBkYzk2YjMy
-    Y2U5ZmUyMDQ0ZmQ0N2M4ZGY5YWFiOWNhYjE3OWM4MTlkOTg4MjIxZjAyOWE3
-    ODVlY2FhZDllOGJjODM4MDI2NmRmNzg5ZmUyODE2NTE1YmU4OWU=
+    OGM5Y2ExMDFmYTU2YmU0ODE5ZTY3OTNmZmM5YzM5YWNhMjc3MWJhZmNjY2U1
+    OWE3YTdlYTJlY2VhODM3MGYyY2Y4MTgyMzczMmZjNjg4YjNjZDJhNGE0Y2Ex
+    NjExNWEyMDJhZWI5NGVmZTM3OTFiZGUxZTRiNjlmZGE2MmIzN2U=

data/app/assets/javascripts/caboose_store/modules/checkout.js

@@ -166,7 +166,7 @@ Caboose.Store.Modules.Checkout = (function() {
     $.ajax({
       url: '/checkout/shipping',
       type: 'put',
-      data: { shipping_code: event.target.value },
+      data: { shipping_method_code: event.target.value },
       success: function(response) {
         if (response.success) {
           self.order = response.order;
@@ -192,7 +192,7 @@ Caboose.Store.Modules.Checkout = (function() {
   self.paymentSubmitHandler = function(event) {
     event.preventDefault();
     
-    if (!self.order.shipping_code) {
+    if (!self.order.shipping_method_code) {
       alert('Please choose a shipping method');
     } else {
       self.$checkout.off('submit', '#checkout-payment form#payment').addClass('loading');

data/app/assets/javascripts/caboose_store/modules/checkout_step3.js

@@ -17,8 +17,8 @@ Caboose.Store.Modules.CheckoutStep3 = (function() {
       url: '/checkout/shipping',
       type: 'put',      
       data: { 
-        shipping_method: $(event.target).data('shipping-method'),
-        shipping_code:   $(event.target).data('shipping-code') 
+        shipping_method:      $(event.target).data('shipping-method'),
+        shipping_method_code: $(event.target).data('shipping-code') 
       },
       success: function(resp) {
         if (resp.errors && resp.errors.length > 0)

data/app/controllers/caboose_store/checkout_controller.rb

@@ -163,7 +163,7 @@ module CabooseStore
     # PUT /checkout/shipping
     def update_shipping      
       @order.shipping_method      = params[:shipping_method]
-      @order.shipping_method_code = params[:shipping_code]                 
+      @order.shipping_method_code = params[:shipping_method_code]                 
       render :json => { 
         :success => @order.save, 
         :errors => @order.errors.full_messages 

data/app/models/caboose_store/order.rb

@@ -17,9 +17,9 @@ module CabooseStore
     attr_accessible :id,
       :order_number,
       :subtotal,
-      :tax,
-      :shipping_code,
+      :tax,      
       :shipping_method,
+      :shipping_method_code,
       :shipping,
       :handling,
       :discount,
@@ -170,7 +170,7 @@ module CabooseStore
     end
     
     def calculate_shipping
-      return 0 if !self.shipping_address || !self.shipping_code
+      return 0 if !self.shipping_address || !self.shipping_method_code
       ShippingCalculator.rate(self)[:total_price]
     end
     

data/app/models/caboose_store/schema.rb

@@ -101,7 +101,8 @@ class CabooseStore::Schema < Caboose::Utilities::Schema
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
         [ :landing_page_ref      , :string   ],
-        [ :shipping_code         , :string   ],
+        [ :shipping_method       , :string   ],
+        [ :shipping_method_code  , :string   ],
         [ :transaction_id        , :string   ],
         [ :auth_code             , :string   ],
         [ :alternate_id          , :integer  ],

data/app/models/caboose_store/shipping_calculator.rb

@@ -58,7 +58,7 @@ module CabooseStore
       ups_response = ups.find_rates(origin, destination, packages)
       
       rates = ups_response.rates.collect do |rate|
-        next if CabooseStore::allowed_shipping_codes && !CabooseStore::allowed_shipping_codes.index(rate.service_code)
+        next if CabooseStore::allowed_shipping_method_codes && !CabooseStore::allowed_shipping_method_codes.index(rate.service_code)
         
         {
           :service_code    => rate.service_code,
@@ -72,8 +72,8 @@ module CabooseStore
     end
     
     def self.rate(order)
-      return nil if !order.shipping_code
-      self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_code }
+      return nil if !order.shipping_method_code
+      self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_method_code }
       return nil
     end
   end

data/lib/caboose-store.rb

@@ -14,7 +14,7 @@ module CabooseStore
     :authorize_net_login_id,
     :authorize_net_transaction_key,
     :handling_percentage,
-    :allowed_shipping_codes,
-    :default_shipping_code
+    :allowed_shipping_method_codes,
+    :default_shipping_method_code
 end
 

data/lib/caboose-store/engine.rb

@@ -80,7 +80,7 @@ module CabooseStore::BootStrapper
         :landing_page_ref => params[:ref] || nil
       )
       
-      order.update_attribute(:shipping_code, CabooseStore::default_shipping_code) if CabooseStore::default_shipping_code
+      order.update_attribute(:shipping_method_code, CabooseStore::default_shipping_method_code) if CabooseStore::default_shipping_method_code
       
       # Define the cart ID
       session[:cart_id] = order.id

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.35'
+  VERSION = '0.0.36'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - William Barry