caboose-cms 0.5.159 → 0.5.160

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGRlMTBkOTUzOWM0NzkxZGQ0NGVlMDdlY2E3MzQ3ZDMxYjAzZjg5Mg==
+    NTZmYjMwNTE1OTY0OWNjYzRkMTczOWRlZTgyMzI4ZWExOTc3MjJlMA==
   data.tar.gz: !binary |-
-    MGQxNDcyYWIzNzBlOGJhZjNmYzY4OGNhZjRmMDQ4YTc2MzA1MDc3ZQ==
+    MDRiYjE5ZjNkMTQwNDI1M2IzMTRjNWQ5ZWUzZDg1MjE3NzdkMjYxMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjEzN2NlM2M3YzEwMzA2MDBiMWUzYTczMjFmZWFiOTIyYTQ3NWY2ZTM2YjY1
-    ZWFhOWMwNWMxYTJlNmU5MzBmZWEwNzAzNWFjZDZiOTk3ZDE1ZTdjMWVlOWMz
-    NTE5Y2RjZDk1NjM0YTNlNTAyZTAzYTQ2ODQxMWI3MDgxMzk5OTg=
+    ZjUxM2NjMDBmMGM1NDVmMjJkZmZhNDRmYzk3YzJkNDEyNTllZDAzOGQ3NjJj
+    N2Y3OWFmYzM5MTE2ZTVhNjIwNzljN2I2ZjgyYzI1MzA4MTdhNWRlODUxN2Jh
+    NzYwMDU2MzM3N2MyNWZlNmQ3NzdhZWI5ZWU3NTY1NmQ2ZTkyOTk=
   data.tar.gz: !binary |-
-    ZjkwYmVjNjE3MDU4ZGEzYmRiNmVhYmE2MTM5NjI4NjViYzRlMGVjZjI2Mzgz
-    ZDE3YTFlM2Y5N2E4OTA0OTg3NThlOGQyMzYzMWJjNDAyMzU2NmU4MGFjYmI1
-    NTliODNmZmFmMWQyMDE5MGNmYWZmMzAyODEyYzk2NDE1MzZhNDc=
+    MTRhN2M3OTQ5MDg0MjUwOTE3MjFhOGE4YTZlYzQxYjZkNDFhMTdiOWE5ODk1
+    Yjc2ZTM2YTA5MGRmOTgwZjNlNmVhOTk2MDNlNmJmN2RmMzM5NTRmNmQ2MDc3
+    M2FhNmU0NTQ5ZDM5NGI2ZmQ3Yjc0YTgxM2NjMjI3OGJiNWIyNmM=

data/app/controllers/caboose/my_account_orders_controller.rb

@@ -7,7 +7,7 @@ module Caboose
       
       @pager = Caboose::PageBarGenerator.new(params, {
         'customer_id'          => logged_in_user.id,         
-        'status'               => [Order::STATUS_PENDING, Order::STATUS_CANCELED, Order::STATUS_SHIPPED]
+        'status'               => [Order::STATUS_PENDING, Order::STATUS_CANCELED, Order::STATUS_READY_TO_SHIP, Order::STATUS_SHIPPED]        
       }, {
         'model'          => 'Caboose::Order',
         'sort'           => 'order_number',

data/app/models/caboose/order.rb

@@ -242,7 +242,7 @@ module Caboose
             
       if self.financial_status == Order::FINANCIAL_STATUS_CAPTURED
         resp.error = "Funds for this order have already been captured."    
-      elsif order.total > t.amount
+      elsif self.total > t.amount
         resp.error = "The order total exceeds the authorized amount."
       elsif t.nil?
         resp.error = "This order doesn't seem to be authorized."

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

@@ -9,11 +9,11 @@
 
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/orders';" />
-<% if @order.financial_status == 'authorized' %>
+<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_AUTHORIZED %>
   <input type='button' value='Capture Funds' onclick="controller.capture_funds();" />
   <input type='button' value='Void'          onclick="controller.void_order();" />
 <% end %>
-<% if @order.financial_status == 'captured' %>
+<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_CAPTURED %>
   <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
 <% end %>
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.159'
+  VERSION = '0.5.160'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.159
+  version: 0.5.160
 platform: ruby
 authors:
 - William Barry