caboose-cms 0.7.26 → 0.7.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cbedc8eb22cdc7fe35035da2e8a2115b21242af
-  data.tar.gz: 32d51d39f8312a4a9a46e994c485efbf4c531fa4
+  metadata.gz: 09b8be49da8f98835e23293bd190dc36fe08e7ca
+  data.tar.gz: ea3dc7cf4d1d322ab599d456a9e2e2b687a05748
 SHA512:
-  metadata.gz: 236bd5322624a04ea7b2cc4b6c06e1c3216b556b24f5f62cc07a5f6c8d7ca4159622498d8acc53dd2427442afd538ac6bd24d1afe690dfa120949af803b76ee4
-  data.tar.gz: 05916a5469fdc4c67e88df67179a4977184efa71dbfeaaec8b9839a11164b87fcfe04118687454b3e6074d76eaa5850907d181292397e8a89fdca3a3286eab04
+  metadata.gz: 61ad49076220e5e907860229e7c93669111592147219fd10c3d8b40c698a31555fca740b00ec5e71a1268e3a58dc97f62a16154df385d7acd32e1f9208a3d7c1
+  data.tar.gz: 6a9bf468065377ca084c7504bc10905810df3215c4ef0dbe0f2739fef1515fced6ccd7725c76358aeeaf298af3f05bba4c806a252925b0bdc95488bc22dba5b9

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

@@ -49,10 +49,31 @@ Caboose.Store.Modules.CheckoutPayment = (function() {
       }
     }
     else
-    {    
-      $('#message').html("<p class='loading'>Processing payment...</p>");
-      $('form#payment').submit();
-      $('#checkout-continue button').hide();
+    {
+      // Verify that the order total is correct before submitting
+      $('#message').html("<p class='loading'>Verifying order total...</p>");
+      var total_is_correct = true;      
+      $.ajax({
+        url: '/checkout/total',
+        type: 'get',
+        success: function(x) {
+          if (parseFloat(x) != CABOOSE_ORDER_TOTAL)                      
+            total_is_correct = false;           
+        },
+        async: false                  
+      });      
+      
+      if (total_is_correct == false)
+      {
+        $('#message').html("<p class='note error'>It looks like the order total has changed since this page has refreshed. Please submit your order again after this page refreshes.");
+        setTimeout(function() { window.location.reload(true); }, 3000);
+      }
+      else
+      {
+        $('#message').html("<p class='loading'>Processing payment...</p>");
+        $('form#payment').submit();
+        $('#checkout-continue button').hide();
+      }
     }
   };
   

data/app/controllers/caboose/checkout_controller.rb

@@ -181,6 +181,16 @@ module Caboose
     end
     
     #===========================================================================
+        
+    # GET /checkout/total
+    def verify_total
+      total = 0.00
+      if logged_in?              
+        @order.calculate
+        total = @order.total
+      end
+      render :json => total
+    end
     
     # GET /checkout/address
     def address

data/app/controllers/caboose/orders_controller.rb

@@ -18,7 +18,8 @@ module Caboose
         'customer_id'          => '', 
         'status'               => Order::STATUS_PENDING,
         'shipping_method_code' => '',
-        'id'                   => ''
+        'id'                   => '',
+        'order_number'         => ''
       }, {
         'model'          => 'Caboose::Order',
         'sort'           => 'id',

data/app/views/caboose/checkout/payment.html.erb

@@ -124,11 +124,13 @@ store_config = @site.store_config
 var SHOW_RELAY = <%= @show_relay ? 'true' : 'false' %>;
 
 var cart = false;
+var CABOOSE_ORDER_TOTAL = 0.0;
 $(document).ready(function() {
   cart = new Cart({
     allow_edit_line_items: false,
     allow_edit_gift_cards: false
   });
+  CABOOSE_ORDER_TOTAL = <%= Caboose.json(@order.total); %>;
 });
 
 </script>

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

@@ -11,7 +11,8 @@
   <a class="caboose-btn" href='/admin/orders/summary-report' target='_blank'>Summary Report</a>
 </p>
 <form action='/admin/orders' method='get' id='search_form' style='display: none;'>
-  <p><input type='text' name='id' placeholder='Order ID' value="<%= @pager.params['id'] %>" style='width: 100px;' /></p>
+  <p><input type='text' name='id'           placeholder='Order ID'     value="<%= @pager.params['id']           %>" style='width: 100px;' /></p>
+  <p><input type='text' name='order_number' placeholder='Order Number' value="<%= @pager.params['order_number'] %>" style='width: 100px;' /></p>
   <p><select name='customer_id'>
       <optgroup label='Status' style='width: 100px'>
         <option value=''>-- All customers --</option>        

data/config/routes.rb

@@ -513,6 +513,7 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   
   get  '/checkout'                 => 'checkout#index'
+  get  '/checkout/total'           => 'checkout#verify_total'  
   post '/checkout/attach-user'     => 'checkout#attach_user'
   post '/checkout/attach-guest'    => 'checkout#attach_guest'
   get  '/checkout/addresses'       => 'checkout#addresses'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.26'
+  VERSION = '0.7.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.26
+  version: 0.7.27
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg