caboose-cms 0.6.21 → 0.6.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzdkNGFjZTA5YTcyYTEyZTAxNzhjNTk5OGZlNDNlMDFiMGFkODFjYQ==
+    NDJlNjMyNDg2NTIwNWRjMTNiZjYxMDFmNDY5NzkxMTc4MzJjOTczZQ==
   data.tar.gz: !binary |-
-    OWQwZWYxYjQ0MDI5ZjEyY2EzZTRhNTNjOWI0OWYyNTkwYWFmMmU3Nw==
+    NWZlMjMzNDAyMjRlOWY2MzA3MjE0YzYyYzJkMDM1YWQ0NmE2YmU1NQ==
 SHA512:
   metadata.gz: !binary |-
-    NDk3N2FkNWI5ZGEyYjM0ZDI1ZDczOWYzZWMzNDQyOTcyM2FiMTVlOGZmZmE4
-    MGQxMmI1ZDliOTE3NzM2YmY4OGIxYjJhYWZmMmZkMDVhZWQ5OGZiMTA5ZmYz
-    YzgwNGJjZjliOWEzMmUxNWVjOWJhOTVlZDVkNDEzNTY5ZjlmZmY=
+    NjczMDJhZTc4MGZlOGViYWFjMjg4YTMzYjdiNzcxNzVkYTUwM2FkYTRmYzI2
+    YzhiOGE5OGNiYWUzZTA5ZTQwMGU2ZjJhMTZjZTA5YTRhNjM2ZDM2YWEyYWRh
+    YTUyNmZmNjAyY2UxN2I1Y2M2Mjk2YzhiMTYyNjg1YjFkZWViMDY=
   data.tar.gz: !binary |-
-    OGY2MjcxZDk1YjJjNDcyMWQzYzMzMzZiMzEzNjM3MDZkMzRkYWJkNjBhNzBj
-    ODQwMjNmMzZiY2Y2NTY2MTJkOTlkYzhhNzJhMjQ1ZTg2NTY2Yzk1MDI0YTUw
-    MGNlMTlkMTMyMzY0MDU1MjdhZGU2MWNiMzUxNTc4ZGQ3ODczNjA=
+    ZjEyNTU2MTE1YjFiMjE0ZmExMDBlNmJjMzIzMTA4M2JkZjc5M2YyOWNhM2Uz
+    OTcxNmE4NjNjMjBmNGQ1MWQzNzU3MGU4YjQ0OWFmNGI4YTE3N2E2Y2UwMWM3
+    OGQ4MTNiNzM0Nzg2MzA1YzFlNTliYjdlMTFiZTg2NGU1YTljZDM=

data/app/controllers/caboose/checkout_controller.rb

@@ -337,6 +337,7 @@ module Caboose
         order.financial_status = Order::FINANCIAL_STATUS_AUTHORIZED
         order.status = Order::STATUS_PENDING
         order.order_number = @site.store_config.next_order_number
+        order.date_authorized = DateTime.now.utc
          
         # Take funds from any gift cards that were used on the order
         order.take_gift_card_funds

data/app/controllers/caboose/orders_controller.rb

@@ -84,7 +84,7 @@ module Caboose
       return if !user_is_allowed('orders', 'edit')
            
       order = Order.find(params[:id])
-      resp = order.capture_funds
+      resp = order.capture_funds      
       
       render :json => resp
     end
@@ -176,7 +176,11 @@ module Caboose
             order.custom_discount = value
             order.discount = order.calculate_discount
             order.total = order.calculate_total
-          when 'status'          then order.status          = value
+          when 'status'          then
+            order.status = value
+            if value == 'Shipped'
+              order.date_shipped = DateTime.now.utc
+            end            
           when 'customer_id'     then order.customer_id     = value            
         end
       end

data/app/models/caboose/order.rb

@@ -260,6 +260,11 @@ module Caboose
             ot.auth_code      = response.authorization_code
             ot.response_code  = response.response_code            
             ot.save
+            
+            if ot.success
+              self.date_captured = DateTime.now.utc
+              self.save              
+            end
                                     
             self.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
             resp.success = 'Captured funds successfully'

data/app/models/caboose/schema.rb

@@ -403,6 +403,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :notes                 , :text     ],
         [ :status                , :string   ],
         [ :date_created          , :datetime ],
+        [ :date_authorized       , :datetime ],
+        [ :date_captured         , :datetime ],
+        [ :date_shipped          , :datetime ],
         [ :referring_site        , :text     ],
         [ :landing_page          , :string   ],
         [ :landing_page_ref      , :string   ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.21'
+  VERSION = '0.6.22'
 end

metadata

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