caboose-cms 0.5.204 → 0.5.205

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGQxN2VhNTU4MDUxZjBiYWFjMTJjNmVmNjU0ODMxMmEwNDFkMmQ1Mw==
+    NjY4YWExNWMzMzgyNjg2ZDFkMDY0NTY3YzA4YzM5NzRiZDVlMmFjYg==
   data.tar.gz: !binary |-
-    YzA5MjBkNTBiMjMxOTg0OWE2YjczOTE1ODgzZTJhMzgyMjliNTBkYQ==
+    OGIzNTA1YTk5M2Q2YmM0MDQ5YWFkNjU2N2I1ZWY0ZTgzMWJlZDdmZA==
 SHA512:
   metadata.gz: !binary |-
-    N2YwMDYyZWM3NjVhYjA5NGJmMzlhNTliOTgzZGIyNmFhY2FkOGEyZWQ2MjI1
-    YTNjNzVjNmZkMThjZWU3MWM0NWM4ZTBiZDRhZTdlMzE5YjVkMTM1ZjQ3MDQz
-    MzJjMDQ1ODE1MTM0ZGU4NDUzYzNhZGRlNWI2NGNmZDg2MWNjYTM=
+    MjhmZjU5YmNkY2VlZTllMmFlZmFkODVlOTBmNTFlYTMzZDBjY2YzNjllNWE3
+    YjVlNTg0YjVhODAwMzU1N2IxMmFjYTAxZWIxZmE5YjAwOTc2OGJiYTJmMjRk
+    NThiNTJlODE2YWRhNDQ5ZWU5NmZhOWE5M2YwZjU5MjZjYWRlM2I=
   data.tar.gz: !binary |-
-    YTUyYWEyZDI3Nzg3YTI5ZjM3OGQ2ZTAyYjczYWJkOTFmYjMyMGUxY2FkOGM0
-    MjgzYTYxYThjYWYyZGIwM2NlYTAyNzFhM2EwODA5ZWE0ZGQ1MzFiYTQwOGNl
-    ZTBmZGY5YTc2YjllYjhiYzYwNzdiNzVlYjU5MWZiYTkwYjVmYmE=
+    M2FmMDg4NmZjODU4OWRhMTU2MWFjZmIxNjczNmU1YjJlYTY0YjI1ODAzYzYw
+    NjYxZmQwMjdiMTc2YzhlOWU4OWQ0MGU2MmRjOWM1Yjk5OWIxYjYwYWU0NGI0
+    NjBhYzgyOGU1MTA3OWU1NWY4ZWM2ZDY1ZGY1NGY1MGU2ZWUwNTA=

data/app/assets/javascripts/caboose/admin_edit_order.js

@@ -6,14 +6,28 @@ OrderController.prototype = {
   order_id: false,
   order: false,
   authenticity_token: false,
+  store_config: false,
   
   init: function(params)
   {
     for (var i in params)
       this[i] = params[i];
     
+    var that = this;            
+    $(document).ready(function() {
+      that.get_store_config();
+      that.refresh(); 
+    });
+  },
+  
+  get_store_config: function()
+  {
     var that = this;
-    $(document).ready(function() { that.refresh(); });
+    $.ajax({
+      url: '/admin/store/json',
+      success: function(sc) { that.store_config = sc; },
+      async: false
+    });    
   },
   
   refresh: function(after)
@@ -484,15 +498,11 @@ OrderController.prototype = {
           var tr = $('<tr/>');
           if (j == 0)
           {
-            tr.append($('<td/>').attr('rowspan', line_items.length)
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_package_method'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_status'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_tracking_number'))
-              .append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total'))
-            );
+            tr.append($('<td/>').attr('rowspan', line_items.length).attr('valign', 'top').append(that.package_summary(op, line_items)));
           }                       
           tr.append($('<td/>')
             .append(that.line_item_link(li))
+            .append(that.line_item_weight(li))
             .append(that.gift_options(li))
             .append($('<div/>').attr('id', 'line_item_' + li.id + '_message'))
           );
@@ -528,6 +538,26 @@ OrderController.prototype = {
     });
   },
   
+  package_summary: function(op, line_items)
+  {
+    var that = this;
+    
+    var total_weight = 0.0;
+    $.each(line_items, function(i, li) {      
+      total_weight += li.variant.weight * li.quantity;
+    });
+    
+    var div = $('<div/>');                
+    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_package_method'));
+    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_status'));
+    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_tracking_number'));
+    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total'));    
+    div.append($('<div/>').attr('id', 'orderpackage_' + op.id + '_total_weight').html("Total weight: " + total_weight + " " + that.store_config.weight_unit));
+    div.append($('<a/>').attr('href','#').data('order_package_id', op.id).html('Recalculate').click(function(e) { e.preventDefault(); that.calculate_shipping($(this).data('order_package_id')); }));            
+    div.append($('<div/>').attr('id', 'order_package_' + op.id + '_message'));            
+    return div;
+  },
+  
   gift_options: function(li)
   {
     var div = $('<div/>');
@@ -570,6 +600,16 @@ OrderController.prototype = {
     return link;    
   },
   
+  line_item_weight: function(li)
+  {
+    var that = this;
+    var v = li.variant;
+    div = $('<div/>');
+    div.append("Unit Weight: " + Math.floor(v.weight) + " " + that.store_config.weight_unit + "<br />");
+    div.append("Total Weight: " + Math.floor(v.weight * li.quantity) + " " + that.store_config.weight_unit);
+    return div;        
+  },
+  
   line_item_options: function(li_id, order_package_id)
   {
     var that = this;
@@ -867,6 +907,27 @@ OrderController.prototype = {
     });
   },
   
+  calculate_shipping: function(order_package_id)
+  {
+    var that = this;
+    $('#order_package_' + order_package_id + '_message').html("<p class='loading'>Calculating...</p>");
+    var shipping_method_id = $('');
+    $.ajax({
+      url: '/admin/orders/' + that.order_id + '/packages/' + order_package_id + '/calculate-shipping',
+      success: function(resp) {
+        if (resp.error)
+          $('#order_package_' + order_package_id + '_message').html("<p class='note error'>" + resp.error + "</p>");
+        else
+        {
+          that.refresh_order(function() { 
+            $('#orderpackage_' + order_package_id + '_total').val(resp.rate); 
+          });
+          $('#order_package_' + order_package_id + '_message').empty();
+        }
+      }
+    });    
+  },
+  
   has_shippable_items: function()
   {
     var that = this;

data/app/assets/javascripts/caboose/model/index_table.js

@@ -377,7 +377,9 @@ IndexTable.prototype = {
   {
     var that = this;
     
-    var tr = $('<tr/>').attr('id', 'model_row_' + m.id); 
+    var tr = $('<tr/>').attr('id', 'model_row_' + m.id);
+    if (that.highlight_id && that.highlight_id == m.id)
+      tr.addClass('highlight');
       
     if (that.allow_bulk_edit || that.allow_bulk_delete || that.allow_duplicate)
     {

data/app/controllers/caboose/order_packages_controller.rb

@@ -120,189 +120,45 @@ module Caboose
       render :json => resp
     end
     
-    # GET /admin/orders/line-item-status-options
-    def admin_line_item_status_options
-      arr = ['pending', 'ready to ship', 'shipped', 'backordered', 'canceled']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text  => status
-        }
-      end
-      render :json => options
-    end
-    
-    # GET /admin/orders/:id/capture
-    def capture_funds
+    # GET /admin/orders/:order_id/packages/:id/calculate-shipping
+    def calculate_shipping
       return if !user_is_allowed('orders', 'edit')
+
+      op = OrderPackage.find(params[:id])
+      order = op.order
       
-      response = Caboose::StdClass.new({
-        'refresh' => nil,
-        'error'   => nil,
-        'success' => nil
-      })
-      
-      order = Order.find(params[:id])
-      
-      if order.financial_status == 'captured'
-        resp.error = "Funds for this order have already been captured."    
-      elsif order.total > order.auth_amount
-        resp.error = "The order total exceeds the authorized amount."
-      else
-        if PaymentProcessor.capture(order)
-          order.update_attribute(:financial_status, 'captured')
-          response.success = 'Captured funds successfully'
-        else
-          response.error = 'Error capturing funds'
-        end
-          
-        #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
-        #  order.financial_status = 'captured'
-        #  order.save
-        #  
-        #  if order.discounts.any?
-        #    order.update_attribute(:amount_discounted, order.discounts.first.amount_current)
-        #    order.update_gift_cards
-        #  end
-        #  
-        #  response.success = "Captured funds successfully"
-        #else
-        #  response.error = "Error capturing funds."
-        #end
-      end
-      
-      render :json => response
-    end
+      render :json => { :error => "Empty order" } and return if order.nil?
+      render :json => { :error => "No shippable items in order package" } and return if !order.has_shippable_items?
+      render :json => { :error => "Empty shipping address" } and return if order.shipping_address.nil?
 
-    # GET /admin/orders/:id/void
-    #def void
-    #  return if !user_is_allowed('orders', 'edit')
-    #
-    #  response = Caboose::StdClass.new({
-    #    'refresh' => nil,
-    #    'error' => nil,
-    #    'success' => nil
-    #  })
-    #
-    #  order = Order.find(params[:id])
-    #
-    #  if order.financial_status == 'captured'
-    #    response.error = "This order has already been captured, you will need to refund instead"
-    #  else
-    #    if order.total < order.amount_discounted || PaymentProcessor.void(order)
-    #      order.financial_status = 'cancelled'
-    #      order.status = 'voided'
-    #      order.save
-    #    
-    #      response.success = "Order voided successfully"
-    #    else
-    #      response.error = "Error voiding order."
-    #    end
-    #  end
-    #
-    #  render json: response
-    #end
-  
-    # GET /admin/orders/:id/refund
-    # def refund
-    #   return if !user_is_allowed('orders', 'edit')
-    # 
-    #   response = Caboose::StdClass.new({
-    #     'refresh' => nil,
-    #     'error' => nil,
-    #     'success' => nil
-    #   })
-    # 
-    #   order = Order.find(params[:id])
-    # 
-    #   if order.financial_status != 'captured'
-    #     response.error = "This order hasn't been captured yet, you will need to void instead"
-    #   else
-    #     ap order.total
-    #     ap order.amount_discounted
-    #     
-    #     if order.total < order.amount_discounted || PaymentProcessor.refund(order)
-    #       order.financial_status = 'refunded'
-    #       order.status = 'refunded'
-    #       order.save
-    #       
-    #       discount = order.discounts.first
-    #       ap '==========================='
-    #       ap order.amount_discounted + discount.amount_current
-    #       ap '==========================='
-    #       discount.update_attribute(:amount_current, order.amount_discounted + discount.amount_current) if order.discounts.any?
-    #       
-    #       response.success = "Order refunded successfully"
-    #     else
-    #       response.error = "Error refunding order."
-    #     end
-    #   end
-    # 
-    #   render json: response
-    # end
+      rate = ShippingCalculator.calculate_rate(op)
+      render :json => { :error => "No rate found for given shipping package and method" } and return if rate.nil?
 
-    # GET /admin/orders/status-options
-    def admin_status_options
-      return if !user_is_allowed('categories', 'view')
-      statuses = ['cart', 'pending', 'ready to ship', 'shipped', 'canceled']
-      options = []
-      statuses.each do |s|
-        options << {
-          'text' => s,
-          'value' => s
-        }
-      end       
-      render :json => options    
-    end
-    
-    # GET /admin/orders/test-info
-    def admin_mail_test_info
-      TestMailer.test_info.deliver
-      render :text => "Sent email to info@tuskwearcollection.com on #{DateTime.now.strftime("%F %T")}"
-    end
-    
-    # GET /admin/orders/test-gmail
-    def admin_mail_test_gmail
-      TestMailer.test_gmail.deliver
-      render :text => "Sent email to william@nine.is on #{DateTime.now.strftime("%F %T")}"
-    end
-    
-    # GET /admin/orders/google-feed
-    def admin_google_feed
-      d2 = DateTime.now
-      d1 = DateTime.now
-      if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')                  
-        d1 = Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first.value      
-        d1 = DateTime.parse(d1)
-      elsif Order.exists?("status = 'shipped' and date_authorized is not null")
-        d1 = Order.where("status = ? and date_authorized is not null", 'shipped').reorder("date_authorized DESC").limit(1).pluck('date_authorized')
-        d1 = DateTime.parse(d1)
-      end
+      op.total = rate
+      op.save
       
-      # Google Feed Docs
-      # https://support.google.com/trustedstoresmerchant/answer/3272612?hl=en&ref_topic=3272286?hl=en
-      tsv = ["merchant order id\ttracking number\tcarrier code\tother carrier name\tship date"]            
-      if Order.exists?("status = 'shipped' and date_authorized > '#{d1.strftime("%F %T")}'")
-        Order.where("status = ? and date_authorized > ?", 'shipped', d1).reorder(:id).all.each do |order|
-          tracking_numbers = order.line_items.collect{ |li| li.tracking_number }.compact.uniq
-          tn = tracking_numbers && tracking_numbers.count >= 1 ? tracking_numbers[0] : ""
-          tsv << "#{order.id}\t#{tn}\tUPS\t\t#{order.date_shipped.strftime("%F")}"                              
-        end
-      end
+      order.calculate_shipping
+      order.calculate_total
+      order.save
       
-      # Save when we made the last call
-      setting = if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')
-        Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first
-      else
-        Caboose::Setting.new(:name => 'google_feed_date_last_submitted')
-      end
+      render :json => { :error => "No rate found for shipping method" } and return if rate.nil?                   
+      render :json => { :success => true, :rate => rate }            
+    end
+    
+    # GET /admin/orders/:order_id/packages/:id/shipping-rates
+    def shipping_rates
+      return if !user_is_allowed('orders', 'edit')
+
+      op = OrderPackage.find(params[:id])
+      order = op.order
       
-      setting.value = d2.strftime("%F %T")
-      setting.save            
-                   
-      # Print out the lines
-      render :text => tsv.join("\n")
+      render :json => { :error => "Empty order" } and return if order.nil?
+      render :json => { :error => "No shippable items in order package" } and return if !order.has_shippable_items?
+      render :json => { :error => "Empty shipping address" } and return if order.shipping_address.nil?
+                                                        
+      rates = ShippingCalculator.order_package_rates(op)      
+      render :json => rates            
     end
+            
   end
 end

data/app/controllers/caboose/shipping_packages_controller.rb

@@ -141,7 +141,7 @@ module Caboose
           when 'outside_length'     then sp.outside_length      = value.to_f
           when 'outside_width'      then sp.outside_width       = value.to_f
           when 'outside_height'     then sp.outside_height      = value.to_f
-          when 'volume'             then sp.height              = value.to_f
+          when 'volume'             then sp.volume              = value.to_f
           when 'empty_weight'       then sp.empty_weight        = value.to_f
           when 'cylinder'           then sp.cylinder            = value.to_i
           when 'flat_rate_price'    then sp.flat_rate_price     = value.to_f
@@ -216,13 +216,6 @@ module Caboose
       render :json => options
     end
     
-    # GET /admin/shipping-methods/options
-    # GET /admin/shipping-packages/shipping-method-options
-    def admin_shipping_method_options
-      options = ShippingMethod.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
-      render :json => options              
-    end
-    
     # GET /admin/shipping-methods/options
     # GET /admin/shipping-packages/:id/shipping-method-options
     def admin_shipping_method_options
@@ -231,7 +224,7 @@ module Caboose
         sp = ShippingPackage.find(params[:id])
         options = sp.shipping_methods.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
       else
-        options = ShippingMethod.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => sm.service_name }}
+        options = ShippingMethod.reorder(:carrier, :service_name).all.collect { |sm| { :value => sm.id, :text => "#{sm.service_code} - #{sm.service_name}" }}        
       end
       render :json => options              
     end
@@ -242,7 +235,7 @@ module Caboose
       options = []
       ShippingPackage.where(:site_id => @site.id).reorder('name').all.each do |sp|
         prefix = sp.name ? sp.name : "#{sp.outside_length}x#{sp.outside_width}x#{sp.outside_height}"
-        sp.shipping_methods.each do |sm|
+        sp.shipping_methods.reorder("carrier, service_name").each do |sm|
           options << { 'value' => "#{sp.id}_#{sm.id}", 'text' => "#{prefix} - #{sm.carrier} - #{sm.service_name}" }
         end
       end

data/app/controllers/caboose/store_controller.rb

@@ -4,6 +4,13 @@ module Caboose
   class StoreController < ApplicationController
     layout 'caboose/admin'
     
+    # GET /admin/store/json
+    def admin_json_single
+      return if !user_is_allowed('orders', 'view')
+      sc = @site.store_config
+      render :json => sc      
+    end
+    
     # GET /admin/store
     def admin_edit_general
       return if !user_is_allowed('sites', 'edit')
@@ -129,6 +136,6 @@ module Caboose
       ]
       render :json => options
     end
-    
+        
   end
 end

data/app/models/caboose/order.rb

@@ -306,14 +306,14 @@ module Caboose
         )
         
         case sc.pp_name
-          when 'authorize.net'        
-                    
+          when 'authorize.net'            
             response = AuthorizeNet::SIM::Transaction.new(
               sc.pp_username, 
               sc.pp_password,                      
               self.total,
               :transaction_type => OrderTransaction::TYPE_VOID,
-              :transaction_id => t.transaction_id
+              :transaction_id => t.transaction_id,
+              :test => sc.pp_testing
             )                    
             self.update_attributes(
               :financial_status => Order::FINANCIAL_STATUS_VOIDED,

data/app/models/caboose/order_package.rb

@@ -111,12 +111,22 @@ module Caboose
     end
     
     # Gets the activemerchant package based on the shipping package
-    def activemerchant_package      
+    def activemerchant_package
+      sc = self.order.site.store_config
+      
       weight = 0.0
-      self.line_items.each{ |li| weight = weight + li.variant.weight }
-      weight = weight * 0.035274 # Convert from grams to ounces
+      self.line_items.each{ |li| weight = weight + (li.variant.weight * li.quantity) }      
+      weight = weight * 0.035274 if sc.weight_unit == StoreConfig::WEIGHT_UNIT_METRIC # grams to ounces
+      
       sp = self.shipping_package
-      return Package.new(weight, [sp.outside_length, sp.outside_width, sp.outside_height], :units => :imperial)
+      dimensions = [sp.outside_length, sp.outside_width, sp.outside_height]
+      if sc.length_unit == StoreConfig::LENGTH_UNIT_METRIC # cm to inches
+        dimensions[0] = dimensions[0] / 2.54
+        dimensions[1] = dimensions[0] / 2.54
+        dimensions[2] = dimensions[0] / 2.54
+      end
+      
+      return Package.new(weight, dimensions, :units => :imperial)
     end
 
   end

data/app/models/caboose/shipping_calculator.rb

@@ -8,6 +8,58 @@ module Caboose
       return eval(store_config.custom_shipping_function)    
     end
     
+    #def self.rates(order)
+    #  
+    #  return [] if order.site.nil? || order.site.store_config.nil?
+    #  sc = order.site.store_config
+    #  if !sc.auto_calculate_shipping        
+    #    rates = self.custom_rates(sc, order)
+    #    return rates        
+    #  end
+    #
+    #  origin = Location.new(
+    #    :country => sc.origin_country,
+    #    :state   => sc.origin_state,
+    #    :city    => sc.origin_city,
+    #    :zip     => sc.origin_zip
+    #  )      
+    #  destination = Location.new(
+    #    :country     => sc.origin_country,
+    #    :state       => order.shipping_address.state,
+    #    :city        => order.shipping_address.city,
+    #    :postal_code => order.shipping_address.zip
+    #  )
+    #  carriers = {}      
+    #  carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username   && sc.ups_username.strip.length   > 0 
+    #  carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username  && sc.usps_username.strip.length  > 0
+    #  carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username && sc.fedex_username.strip.length > 0
+    #  
+    #  all_rates = []            
+    #  order.order_packages.all.each do |op|                
+    #    sp = op.shipping_package                            
+    #    package = op.activemerchant_package
+    #    rates = []
+    #    carriers.each do |name, carrier|          
+    #      if sp.uses_carrier(name)                        
+    #        resp = carrier.find_rates(origin, destination, package)                        
+    #        resp.rates.sort_by(&:price).each do |rate|                            
+    #          sm = ShippingMethod.where( :carrier => name, :service_code => rate.service_code, :service_name => rate.service_name).first
+    #          sm = ShippingMethod.create(:carrier => name, :service_code => rate.service_code, :service_name => rate.service_name) if sm.nil?
+    #          next if !sp.uses_shipping_method(sm)
+    #          price = rate.total_price
+    #          price = rate.package_rates[0].rate if price.nil? && rate.package_rates && rate.package_rates.count > 0              
+    #          rates << { :shipping_method => sm, :total_price => (price.to_d/100) }
+    #        end
+    #      end
+    #    end        
+    #    if rates.count == 0
+    #      Caboose.log("Error: no shipping rates found for order package #{op.id}.")
+    #    end
+    #    all_rates << { :order_package => op, :rates => rates }        
+    #  end            
+    #  return all_rates
+    #end
+    
     def self.rates(order)
       
       return [] if order.site.nil? || order.site.store_config.nil?
@@ -17,49 +69,80 @@ module Caboose
         return rates        
       end
 
-      origin = Location.new(
-        :country => sc.origin_country,
-        :state   => sc.origin_state,
-        :city    => sc.origin_city,
-        :zip     => sc.origin_zip
-      )      
-      destination = Location.new(
-        :country     => sc.origin_country,
-        :state       => order.shipping_address.state,
-        :city        => order.shipping_address.city,
-        :postal_code => order.shipping_address.zip
-      )
+      all_rates = order.order_packages.all.collect{ |op| { 
+        :order_package => op, 
+        :rates => self.order_package_rates(op) 
+      }}
+      return all_rates
+    end
+    
+    def self.order_package_rates(op)
+      
+      order = op.order
+      sc = order.site.store_config
+      sa = order.shipping_address
+      origin      = Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
+      destination = Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
       carriers = {}      
       carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username   && sc.ups_username.strip.length   > 0 
       carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username  && sc.usps_username.strip.length  > 0
       carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username && sc.fedex_username.strip.length > 0
       
-      all_rates = []            
-      order.order_packages.all.each do |op|                
-        sp = op.shipping_package                            
-        package = op.activemerchant_package
-        rates = []
-        carriers.each do |name, carrier|          
-          if sp.uses_carrier(name)                        
-            resp = carrier.find_rates(origin, destination, package)                        
-            resp.rates.sort_by(&:price).each do |rate|                            
-              sm = ShippingMethod.where( :carrier => name, :service_code => rate.service_code, :service_name => rate.service_name).first
-              sm = ShippingMethod.create(:carrier => name, :service_code => rate.service_code, :service_name => rate.service_name) if sm.nil?
-              next if !sp.uses_shipping_method(sm)
-              price = rate.total_price
-              price = rate.package_rates[0].rate if price.nil? && rate.package_rates && rate.package_rates.count > 0              
-              rates << { :shipping_method => sm, :total_price => (price.to_d/100) }
-            end
+      sp = op.shipping_package                            
+      package = op.activemerchant_package
+      rates = []
+      carriers.each do |name, carrier|          
+        if sp.uses_carrier(name)                        
+          resp = carrier.find_rates(origin, destination, package)                        
+          resp.rates.sort_by(&:price).each do |rate|                            
+            sm = ShippingMethod.where( :carrier => name, :service_code => rate.service_code, :service_name => rate.service_name).first
+            sm = ShippingMethod.create(:carrier => name, :service_code => rate.service_code, :service_name => rate.service_name) if sm.nil?
+            next if !sp.uses_shipping_method(sm)
+            price = rate.total_price
+            price = rate.package_rates[0].rate if price.nil? && rate.package_rates && rate.package_rates.count > 0              
+            rates << { :shipping_method => sm, :total_price => (price.to_d/100) }
           end
-        end        
-        if rates.count == 0
-          Caboose.log("Error: no shipping rates found for order package #{op.id}.")
         end
-        all_rates << { :order_package => op, :rates => rates }        
-      end            
-      return all_rates
+      end        
+      if rates.count == 0
+        Caboose.log("Error: no shipping rates found for order package #{op.id}.")
+      end
+      return rates
     end
     
+    def self.calculate_rate(op)
+      
+      order = op.order
+      sc = order.site.store_config
+      sa = order.shipping_address
+      origin      = Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
+      destination = Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
+
+      carrier = case op.shipping_method.carrier                    
+        when 'UPS'   then UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account) 
+        when 'USPS'  then USPS.new( :login => sc.usps_username)
+        when 'FedEx' then FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)
+        end
+        
+      Caboose.log(op.shipping_method.inspect)
+
+      sm = op.shipping_method
+      package = op.activemerchant_package                                        
+      resp = carrier.find_rates(origin, destination, package)                        
+      resp.rates.sort_by(&:price).each do |rate|
+        Caboose.log("rate.service_code = #{rate.service_code}, rate.service_name = #{rate.service_name}")
+        sm2 = ShippingMethod.where( :carrier => sm.carrier, :service_code => rate.service_code, :service_name => rate.service_name).first
+        sm2 = ShippingMethod.create(:carrier => sm.carrier, :service_code => rate.service_code, :service_name => rate.service_name) if sm2.nil?
+        if sm2.id == sm.id                    
+          price = rate.total_price
+          price = rate.package_rates[0].rate if price.nil? && rate.package_rates && rate.package_rates.count > 0              
+          return price.to_d/100
+        end        
+      end
+      return nil
+
+    end
+
     def self.rate(order)
       return nil if !order.shipping_service_code
       self.rates(order).each { |rate| return rate if rate[:service_code] == order.shipping_service_code }

data/app/models/caboose/store_config.rb

@@ -39,6 +39,11 @@ module Caboose
       :length_unit,
       :weight_unit
       
+    WEIGHT_UNIT_METRIC   = 'g'
+    WEIGHT_UNIT_IMPERIAL = 'oz'
+    LENGTH_UNIT_METRIC   = 'cm'
+    LENGTH_UNIT_IMPERIAL = 'in'
+      
     def next_order_number
       x = Order.where("order_number is not null").reorder("order_number desc").limit(1).first
       return x.order_number + 1 if x

data/app/views/caboose/variants/admin_index.html.erb

@@ -4,7 +4,7 @@ v = @variant
 
 error_message = nil
 if @highlight_variant_id # Make sure we're not trying to highlight a deleted variant
-  v = Variant.where(:id => @highlight_variant_id).first
+  v = Caboose::Variant.where(:id => @highlight_variant_id).first
   if v.nil?
     error_message = "<p class='note error'>The variant you want to highlight is not in the database.</p>"
   elsif v.status == 'Deleted'
@@ -33,7 +33,7 @@ end
 
 <% content_for :caboose_css do %>
 <style type='text/css'>
-tr.highlight td { background: #ffff99 }
+tr.highlight td { background: #ffffcc !important; }
 td.sort_handle { background: #ccc; width: 20px; }
 
 ul {
@@ -89,6 +89,7 @@ $(document).ready(function() {
       { show: false , name: 'downloadable'              , nice_name: 'Downloadable'                     , sort: 'downloadable'      , type: 'checkbox' , value: function(v) { return v.downloadable        }, text: function(v) { return v.downloadable      ? 'Yes' : 'No' }, width: 50, align: 'center' , bulk_edit: true },
       { show: false , name: 'download_path'             , nice_name: 'Download path'                    , sort: 'download_path'     , type: 'text'     , value: function(v) { return v.download_path       }, width: 50, align: 'left'   , bulk_edit: true }      
     ],
+    <% if @highlight_variant_id %>highlight_id: <%= @highlight_variant_id %>,<% end %>
     new_model_text: 'New Variant',
     new_model_fields: [
       { name: 'alternate_id'      , nice_name: 'Alternate ID' , type: 'text', width: 400 },

data/config/routes.rb

@@ -82,11 +82,12 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   # Store
   #=============================================================================  
-  
+    
   get     "/admin/store/shipping-method-options"    => "store#shipping_method_options"
   get     "/admin/store/payment-processor-options"  => "store#payment_processor_options"        
   get     "/admin/store/length-unit-options"        => "store#length_unit_options"
   get     "/admin/store/weight-unit-options"        => "store#weight_unit_options"
+  get     "/admin/store/json"                       => "store#admin_json_single"
   get     "/admin/store/payment"                    => "store#admin_edit_payment"
   get     "/admin/store/shipping"                   => "store#admin_edit_shipping"
   get     "/admin/store/tax"                        => "store#admin_edit_tax"
@@ -585,19 +586,21 @@ Caboose::Engine.routes.draw do
   put     "/admin/orders/:order_id/line-items/:id"            => "line_items#admin_update"  
   delete  "/admin/orders/:order_id/line-items/:id"            => "line_items#admin_delete"
   
-  get     "admin/orders/:order_id/packages/json"      => "order_packages#admin_json"      
-  put     "admin/orders/:order_id/packages/:id"       => "order_packages#admin_update"
-  post    "admin/orders/:order_id/packages"           => "order_packages#admin_add"
-  delete  "admin/orders/:order_id/packages/:id"       => "order_packages#admin_delete"    
+  get     "/admin/orders/:order_id/packages/json"               => "order_packages#admin_json"
+  get     "/admin/orders/:order_id/packages/:id/calculate-shipping" => "order_packages#calculate_shipping"    
+  get     "/admin/orders/:order_id/packages/:id/shipping-rates" => "order_packages#shipping_rates"
+  put     "/admin/orders/:order_id/packages/:id"                => "order_packages#admin_update"
+  post    "/admin/orders/:order_id/packages"                    => "order_packages#admin_add"
+  delete  "/admin/orders/:order_id/packages/:id"                => "order_packages#admin_delete"    
     
   get     "/admin/orders/:order_id/packages/json"     => "line_items#admin_json"  
   put     "/admin/orders/:order_id/line-items/:id"    => "line_items#admin_update"
   delete  "/admin/orders/:order_id/line-items/:id"    => "line_items#admin_delete"
   
-  get     "admin/orders/:order_id/billing-address/json"   => "billing_addresses#admin_json"      
-  put     "admin/orders/:order_id/billing-address"        => "billing_addresses#admin_update"
-  get     "admin/orders/:order_id/shipping-address/json"  => "shipping_addresses#admin_json"      
-  put     "admin/orders/:order_id/shipping-address"       => "shipping_addresses#admin_update"
+  get     "/admin/orders/:order_id/billing-address/json"   => "billing_addresses#admin_json"      
+  put     "/admin/orders/:order_id/billing-address"        => "billing_addresses#admin_update"
+  get     "/admin/orders/:order_id/shipping-address/json"  => "shipping_addresses#admin_json"      
+  put     "/admin/orders/:order_id/shipping-address"       => "shipping_addresses#admin_update"
   
   #=============================================================================
   # Gift cards

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.204'
+  VERSION = '0.5.205'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.204
+  version: 0.5.205
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg