caboose-cms 0.5.175 → 0.5.176

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMzOGNmOTc2NTFkYWZkNWNiOThhOTZlNTZmOGMwZTU3OGJlMWYyOQ==
+    ODY1NTkwODZhZWFhNDJlMDJkYWE1OGY5NTA4NDViMGM4NWU3OGJkZQ==
   data.tar.gz: !binary |-
-    YzEzNDg4OWRkODM2YjMwNWY5MzhkZDNlNGFiYTY5OGU2ZDc1MjZkOQ==
+    YzE0M2EwOTJhYjdhYmZjZWM4NTYyZjdkMWJmMWNjYjdkYzNiMTc2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NmYzMTU2ZmE2ZGE2Mzg3Y2FjMzk1NTcwODYzNDI5M2QwYmUxMjg1ZWNlMWQ3
-    YzBlNTVlMTc3ZjgyNzZhNDM4ZWMzMTMyOTlmZTc3ODk5YmQzMmEyZDJjMTVl
-    M2ExNzBkNmM5MGZkOGE1MjU4ZWNmYjM5YzU1MTU5M2RhMGZlYTM=
+    NzVhYWExY2M0YzIxZDA0YWYyYzdjM2VmZGQ1ZjEzNmM4MjJkMTU1NGFlMDIz
+    ZDcwOWY2NzA5MWJlYzg2NDA3YjhhMTM2MTg1MjU1ODBiOWE0MmMxOWUyODgx
+    ZTM5ZDBlNzRjMmRkNDI2ODY0NmY3NzhkZDNmNWNhYzM3OWE0YzQ=
   data.tar.gz: !binary |-
-    ZTUxMjA2ZjA3NjJlYjUyNTNiMjc4MjkxZjQ5NDY4OTYxNTdiM2YzOGIwOGZl
-    MzkyMzRmNDJlNGIwNmRlMWM2OGUyMThkYTNkYjgwYjFiZDc1YTVmNjAxMDcx
-    OWZkYWQ1MmEzZGJkYzUwNmVhNWZhZGJkMjNjMjFmOGNlNTUzOWI=
+    MmU2M2JmMzI1OWZjYjFhYWU5NTY4NmEyNjEwNDZkZjcwNTA0OTg2MWFkYWVl
+    YmI5ZDdjZGE2YzRjZmVhMjAyZTAyMTkwOWE2M2UyNmRhM2JkY2IzNTY4ZmJj
+    YzM4MjdiYTdhYTM2YmQ0ZTk5ZmExZWIyZjg2Y2E5ZThjM2QzMjE=

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

@@ -16,13 +16,14 @@ OrderController.prototype = {
     $(document).ready(function() { that.refresh(); });
   },
   
-  refresh: function()
+  refresh: function(after)
   {
     var that = this;
     that.refresh_order(function() {
       $('#order_table').html("<p class='loading'>Getting order...</p>");
       that.print();
-      that.make_editable(); 
+      that.make_editable();
+      if (after) after();
     });    
   },
   
@@ -33,11 +34,23 @@ OrderController.prototype = {
       url: '/admin/orders/' + that.order_id + '/json',
       success: function(order) {                 
         that.order = order;
-        if (after) after(); 
+        that.refresh_numbers();
+        if (after) after();                      
       }
     });
   },
   
+  refresh_numbers: function()
+  {    
+    var that = this;        
+    $('#subtotal').html(curr(that.order.subtotal));        
+    $('#shipping').html(curr(that.order.shipping));                    
+    $('#total'   ).html(curr(that.order.total   ));        
+    $.each(that.order.line_items, function(i, li) {
+      $('#li_' + li.id + '_subtotal').html(curr(li.subtotal));
+    }); 
+  },  
+  
   make_editable: function()
   {    
     var that = this;
@@ -51,7 +64,7 @@ OrderController.prototype = {
           { name: 'status'          , nice_name: 'Status'          , type: 'select' , value: op.status                                            , width: 300, fixed_placeholder: true , options_url: '/admin/orders/line-items/status-options' },
           { name: 'package_method'  , nice_name: 'Package/Method'  , type: 'select' , value: op.shipping_package_id + '_' + op.shipping_method_id , width: 300, fixed_placeholder: false, options_url: '/admin/shipping-packages/package-method-options' },
           { name: 'tracking_number' , nice_name: 'Tracking Number' , type: 'text'   , value: op.tracking_number                                   , width: 300, fixed_placeholder: true, align: 'right' },
-          { name: 'total'           , nice_name: 'Shipping Total'  , type: 'text'   , value: curr(op.total)                                       , width: 300, fixed_placeholder: true, align: 'right' }
+          { name: 'total'           , nice_name: 'Shipping Total'  , type: 'text'   , value: curr(op.total)                                       , width: 300, fixed_placeholder: true, align: 'right' , after_update: function() { that.refresh_order(); }}
         ]
       });              
     });    
@@ -64,7 +77,7 @@ OrderController.prototype = {
         attributes: [
           { name: 'status'          , nice_name: 'Status'           , type: 'select'  , align: 'left' , value: li.status          , text: li.status, width: 150, fixed_placeholder: false, options_url: '/admin/orders/line-items/status-options' },
           { name: 'tracking_number' , nice_name: 'Tracking Number'  , type: 'text'    , align: 'left' , value: li.tracking_number , width: 200, fixed_placeholder: false },
-          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity        , width:  75, fixed_placeholder: false, after_update: function() { that.refresh(); } }
+          { name: 'quantity'        , nice_name: 'Quantity'         , type: 'text'    , align: 'right', value: li.quantity        , width:  75, fixed_placeholder: false, after_update: function() { that.refresh_order(); } }
         ]
       });
     });    
@@ -75,9 +88,9 @@ OrderController.prototype = {
       authenticity_token: that.authenticity_token,
       attributes: [
         { name: 'status'         , nice_name: 'Status'   , type: 'select', value: that.order.status                , width: 100, fixed_placeholder: false, options_url: '/admin/orders/status-options' },
-        { name: 'tax'            , nice_name: 'Tax'      , type: 'text'  , value: curr(that.order.tax)             , width: 100, fixed_placeholder: false, align: 'right' },
-        { name: 'handling'       , nice_name: 'Handling' , type: 'text'  , value: curr(that.order.handling)        , width: 100, fixed_placeholder: false, align: 'right' },
-        { name: 'custom_discount', nice_name: 'Discount' , type: 'text'  , value: curr(that.order.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' }
+        { name: 'tax'            , nice_name: 'Tax'      , type: 'text'  , value: curr(that.order.tax)             , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }},
+        { name: 'handling'       , nice_name: 'Handling' , type: 'text'  , value: curr(that.order.handling)        , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }},
+        { name: 'custom_discount', nice_name: 'Discount' , type: 'text'  , value: curr(that.order.custom_discount) , width: 100, fixed_placeholder: false, align: 'right' , after_update: function() { that.refresh_order(); }}
       ]
     });        
   },
@@ -657,10 +670,10 @@ OrderController.prototype = {
     
     if (that.order.line_items.length > 0)
     {
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Subtotal' )).append($('<td/>').attr('align', 'right').attr('id', 'subtotal').html(curr(that.order.subtotal))));
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Tax'      )).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_tax'))));
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Shipping' )).append($('<td/>').attr('align', 'right').attr('id', 'shipping').html(curr(that.order.shipping))));    
-      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Handling' )).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_handling'))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Subtotal'    )).append($('<td/>').attr('align', 'right').attr('id', 'subtotal').html(curr(that.order.subtotal))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Tax '      ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_tax();      }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_tax'))));                
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').html('Shipping'    )).append($('<td/>').attr('align', 'right').attr('id', 'shipping').html(curr(that.order.shipping))));
+      table.append($('<tr/>').append($('<td/>').attr('colspan', '5').attr('align', 'right').append('Handling ' ).append($('<a/>').attr('href', '#').html('(calculate)').click(function(e) { e.preventDefault(); that.calculate_handling(); }))).append($('<td/>').attr('align', 'right').append($('<div/>').attr('id', 'order_' + that.order.id + '_handling'))));
       if (that.order.discounts)
       {
         $.each(that.order.discounts, function(i, d) {
@@ -829,13 +842,30 @@ OrderController.prototype = {
     $.ajax({
       url: '/admin/orders/' + that.order.id + '/send-for-authorization',
       success: function(resp) {
-        if (resp.error)     $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) { $('#message').empty(); that.refresh(); }
-        if (resp.refresh) { $('#message').empty(); that.refresh(); }
+        if (resp.error)   { that.flash_error(resp.error); }
+        if (resp.success) { that.refresh(function() { that.flash_success("An email has been sent successfully to the customer."); }); }        
       }
     });
   },
 
+  calculate_tax: function()
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/orders/' + that.order_id + '/calculate-tax',
+      success: function(resp) { that.refresh_order(function() { $('#order_' + that.order.id + '_tax').val(that.order.tax); }); }
+    });
+  },
+  
+  calculate_handling: function()
+  {
+    var that = this;
+    $.ajax({
+      url: '/admin/orders/' + that.order_id + '/calculate-handling',
+      success: function(resp) { that.refresh_order(function() { $('#order_' + that.order.id + '_handling').val(that.order.handling); }); }
+    });
+  },
+  
   has_shippable_items: function()
   {
     var that = this;
@@ -847,6 +877,15 @@ OrderController.prototype = {
     return needs_shipping;    
   },
   
+  flash_success: function(str, length) { this.flash_message("<p class='note success'>" + str + "</p>", length); },
+  flash_error:   function(str, length) { this.flash_message("<p class='note error'>" + str + "</p>", length); },    
+  flash_message: function(str, length)
+  {
+    if (!length) length = 5000;
+    $('#message').empty().append(str);
+    setTimeout(function() { $('#message').slideUp(function() { $('#message').empty().show(); }); }, length);
+  }
+  
   //resend_confirmation: function(order_id)
   //{
   //  modal.autosize("<p class='loading'>Resending confirmation..</p>");
@@ -885,7 +924,3 @@ OrderController.prototype = {
   //},
   
 };
-  
-  
-  
-  

data/app/controllers/caboose/line_items_controller.rb

@@ -47,23 +47,29 @@ module Caboose
           when 'order_package_id' then li.order_package_id  = value
           when 'variant_id'       then li.variant_id        = value
           when 'parent_id'        then li.parent_id         = value          
-          when 'unit_price'       then li.unit_price        = value
-          when 'subtotal'         then li.subtotal          = value
+          #when 'unit_price'       then li.unit_price        = value
+          #when 'subtotal'         then li.subtotal          = value
           when 'notes'            then li.notes             = value
           when 'custom1'          then li.custom1           = value
           when 'custom2'          then li.custom2           = value
           when 'custom3'          then li.custom3           = value
           when 'quantity'
             li.quantity = value
+            li.subtotal = li.unit_price * li.quantity
+            
             li.save
-                      	  
+            
+            
+            li.order.subtotal = li.order.calculate_subtotal
+            li.order.total = li.order.calculate_total
+            
             # Recalculate everything
-            r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
-            li.order.shipping = r['negotiated_rate'] / 100
-            li.order.handling = (r['negotiated_rate'] / 100) * 0.05
-            li.order.tax = TaxCalculator.tax(li.order)            
-            li.order.calculate_total
-            li.order.save
+            #r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
+            #li.order.shipping = r['negotiated_rate'] / 100
+            #li.order.handling = (r['negotiated_rate'] / 100) * 0.05
+            #li.order.tax = TaxCalculator.tax(li.order)            
+            #li.order.calculate_total
+            #li.order.save
             
           when 'tracking_number'
             li.tracking_number = value

data/app/controllers/caboose/my_account_orders_controller.rb

@@ -6,8 +6,8 @@ module Caboose
     
     # GET /my-account/orders
     def index
-      return if !logged_in?
-      
+      return if !verify_logged_in
+            
       @pager = Caboose::PageBarGenerator.new(params, {
         'customer_id'          => logged_in_user.id,         
         'status'               => [Order::STATUS_PENDING, Order::STATUS_CANCELED, Order::STATUS_READY_TO_SHIP, Order::STATUS_SHIPPED]        
@@ -23,7 +23,7 @@ module Caboose
       
     # GET /my-account/orders/:id
     def edit
-      return if !logged_in?
+      return if !verify_logged_in
       
       @order = Order.find(params[:id])
       if @order.customer_id != logged_in_user.id

data/app/controllers/caboose/order_packages_controller.rb

@@ -57,8 +57,13 @@ module Caboose
             op.shipping_method_id = arr[1]                      
         end
       end
-      op.order.calculate_total    
-      resp.success = save && op.save
+      
+      op.save
+      op.order.shipping = op.order.calculate_shipping
+      op.order.total = op.order.calculate_total
+      op.order.save
+      
+      resp.success = true
       render :json => resp
     end
     

data/app/controllers/caboose/orders_controller.rb

@@ -55,9 +55,29 @@ module Caboose
     def admin_edit
       return if !user_is_allowed('orders', 'edit')
       @order = Order.find(params[:id])
-      @order.calculate
+      #@order.calculate
       render :layout => 'caboose/admin'
     end
+    
+    # GET /admin/orders/:id/calculate-tax
+    def admin_calculate_tax
+      return if !user_is_allowed('orders', 'edit')
+      order = Order.find(params[:id])
+      order.tax = order.calculate_tax
+      order.total = order.calculate_total
+      order.save
+      render :json => { :success => true }      
+    end
+    
+    # GET /admin/orders/:id/calculate-handling
+    def admin_calculate_handling
+      return if !user_is_allowed('orders', 'edit')
+      order = Order.find(params[:id])
+      order.handling = order.calculate_handling
+      order.total = order.calculate_total
+      order.save
+      render :json => { :success => true }      
+    end
 
     # GET /admin/orders/:id/capture
     def capture_funds
@@ -146,17 +166,25 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
-          when 'tax'             then order.tax             = value                                     
-          when 'shipping'        then order.shipping        = value              
-          when 'handling'        then order.handling        = value
+          when 'tax'             then 
+            order.tax = value
+            order.total = order.calculate_total          
+          when 'handling'        then
+            order.handling = value
+            order.total = order.calculate_total
           when 'custom_discount' then 
             order.custom_discount = value
             order.discount = order.calculate_discount
+            order.total = order.calculate_total
           when 'status'          then order.status          = value
           when 'customer_id'     then order.customer_id     = value            
         end
       end
-      order.calculate_total
+
+      #order.calculate
+      #order.calculate_total
+      #resp.attributes['total'] = { 'value' => order.total }
+      
       resp.success = save && order.save
       render :json => resp
     end

data/app/views/caboose/orders_mailer/customer_payment_authorization.html.erb

@@ -1,5 +1,5 @@
 <p><img src='<%= @order.site.logo.url(:thumb) %>' /></p>
 
 <h1>Order <%= @order.order_number %> is ready for payment!</h1>
-<p>Please <a href='http://<%= raw @order.site.primary_domain %>/my-account/orders/<%= @order.id %>'>review your order</a> and submit payment.</p>
+<p>Please <a href='http://<%= raw @order.site.primary_domain.domain %>/my-account/orders/<%= @order.id %>'>review your order</a> and submit payment.</p>
 <p>Thank you!</p>

data/config/routes.rb

@@ -516,7 +516,9 @@ Caboose::Engine.routes.draw do
   get     "/admin/orders/test-gmail"                  => "orders#admin_mail_test_gmail"  
   get     "/admin/orders/status-options"              => "orders#admin_status_options"
   get     "/admin/orders/new"                         => "orders#admin_new"
-  get     "/admin/orders/print-pending"               => "orders#admin_print_pending"
+  get     "/admin/orders/print-pending"               => "orders#admin_print_pending"  
+  get     "/admin/orders/:id/calculate-tax"           => "orders#admin_calculate_tax"
+  get     "/admin/orders/:id/calculate-handling"      => "orders#admin_calculate_handling"      
   get     "/admin/orders/:id/send-for-authorization"  => "orders#admin_send_for_authorization"
   get     "/admin/orders/:id/capture"                 => "orders#capture_funds"  
   get     "/admin/orders/:id/json"                    => "orders#admin_json"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.175'
+  VERSION = '0.5.176'
 end

metadata

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