caboose-cms 0.9.221 → 0.9.222

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ab4ced3bffac044477484005c6cfa97aafba645d26478ad71f66cad28ed76c
-  data.tar.gz: 4644ad39de9e7ba1e2991285add45128e8a53e76b6a3b60cb7bd6d5b1d8fe8aa
+  metadata.gz: 5c84afb7cc5487f8ac8629eed63ff40539434e7bf63eaf330720d9869791b193
+  data.tar.gz: b3173175ca81d406f33b1bfc8772b390f09f34c23d7c7ebf7dca47fb7459bdac
 SHA512:
-  metadata.gz: 3a36d740c046e87b17a871926f14790c641a7c2ebfd36b1f71a8c152dd9838c46a148bd2b54d46dba67963369232dad06a6702f1dce4de7c75380634f31105b2
-  data.tar.gz: 92be7559a27e9ce83d198c4201eff8223b4884b4988021022a3f900ddc846e42f5adc8e7ef4bd3b6db3cfd71e23e261b373f02f1e5028c2b2e4f3785044088d7
+  metadata.gz: 759382d9241f48b78b766c02d50b6a00db55fd313114cc45ce1803d9a82456fbb9a970252f161825a31bbcb2e1db6649fb73122eb83b94ce753ba62b3bc9c153
+  data.tar.gz: c9905dea84074577dc189b0c26acbfb2375ef163877be7dbbb2918a1afa57bf5c4ced51d55dcaced11a4d019802906f6fd1884a81bc0cc60a94c255f65f50b78

data/app/controllers/caboose/checkout_controller.rb

@@ -242,7 +242,7 @@ module Caboose
                 :amount => (@invoice.total * 100).to_i,
                 :currency => 'usd',
                 :customer => logged_in_user.stripe_customer_id,
-                :capture => false,
+                :capture => sc.auto_capture,
                 :metadata => { :invoice_id => @invoice.id },
                 :statement_descriptor => "Invoice ##{@invoice.id}"
               )
@@ -265,14 +265,15 @@ module Caboose
           render :json => { :error => error }
           return        
         else        
-          @invoice.financial_status = Invoice::FINANCIAL_STATUS_AUTHORIZED                                                   
+          @invoice.financial_status = sc.auto_capture ? Invoice::FINANCIAL_STATUS_CAPTURED : Invoice::FINANCIAL_STATUS_AUTHORIZED                                                   
           @invoice.take_gift_card_funds
         end
       end
       
-      @invoice.status = Invoice::STATUS_PENDING
+      @invoice.status = sc.auto_capture ? Invoice::STATUS_PROCESSED : Invoice::STATUS_PENDING
       @invoice.invoice_number = @site.store_config.next_invoice_number
 
+
       # Update variant limits to reflect this purchase
       @invoice.line_items.each do |li|
         vl = VariantLimit.where(:user_id => @invoice.customer_id, :variant_id => li.variant_id).first
@@ -297,6 +298,7 @@ module Caboose
       
       # Save the invoice
       @invoice.save
+      @invoice.refresh_transactions if sc.auto_capture
       
       # Decrement quantities of variants
       @invoice.decrement_quantities

data/app/controllers/caboose/store_controller.rb

@@ -128,7 +128,8 @@ module Caboose
           when 'starting_invoice_number'          then sc.starting_invoice_number          = value
           when 'default_payment_terms'            then sc.default_payment_terms            = value
           when 'allow_instore_pickup'             then sc.allow_instore_pickup             = value
-                                
+          when 'auto_capture'             then sc.auto_capture             = value
+
           when 'product_vendor_id'                      then pd.vendor_id                      = value   
           when 'product_option1'                        then pd.option1                        = value
           when 'product_option2'                        then pd.option2                        = value

data/app/models/caboose/schema.rb

@@ -1007,7 +1007,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_taxable                   , :boolean ],
         [ :allow_instore_pickup              , :boolean  , { :default => false }],
         [ :instore_tax_rate                  , :decimal  , { :precision => 8, :scale => 2 }],
-        [ :custom_invoice_pdf                , :string  ]
+        [ :custom_invoice_pdf                , :string  ],
+        [ :auto_capture                      , :boolean  , { :default => false }]
       ],  
       Caboose::Subscription => [      
         [ :site_id                           , :integer ], 

data/app/models/caboose/store_config.rb

@@ -48,7 +48,8 @@ module Caboose
       :download_instructions,
       :weight_unit,
       :allow_instore_pickup,
-      :custom_invoice_pdf
+      :custom_invoice_pdf,
+      :auto_capture
       
     WEIGHT_UNIT_METRIC   = 'g'
     WEIGHT_UNIT_IMPERIAL = 'oz'

data/app/views/caboose/store/admin_edit_general.html.erb

@@ -10,6 +10,7 @@ sc = @store_config
 <p><div id='storeconfig_<%= sc.id %>_download_url_expires_in'  ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_starting_invoice_number'  ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_default_payment_terms'    ></div></p>
+<p><div id='storeconfig_<%= sc.id %>_auto_capture'    ></div></p>
 
 <h3 style="margin-bottom:5px;">Dimension Units</h3>
 <div id='storeconfig_<%= sc.id %>_length_unit'              ></div>
@@ -50,7 +51,8 @@ $(document).ready(function() {
       { name: 'download_url_expires_in'  , nice_name: 'Download URL Expires In (minutes)' , type: 'text'     , value: <%= raw Caboose.json(sc.download_url_expires_in    ) %>, width: 400 },
       { name: 'starting_invoice_number'  , nice_name: 'Starting Invoice Number'           , type: 'text'     , value: <%= raw Caboose.json(sc.starting_invoice_number    ) %>, width: 400 },
       { name: 'download_instructions'    , nice_name: 'Download Instructions'             , type: 'textarea' , value: <%= raw Caboose.json(sc.download_instructions      ) %>, width: 800 , height: 200, fixed_placeholder: false },
-      { name: 'default_payment_terms'    , nice_name: 'Default Payment Terms'             , type: 'select'   , value: <%= raw Caboose.json(sc.default_payment_terms      ) %>, width: 400 , options_url: '/admin/store/default-payment-terms-options' }
+      { name: 'default_payment_terms'    , nice_name: 'Default Payment Terms'             , type: 'select'   , value: <%= raw Caboose.json(sc.default_payment_terms      ) %>, width: 400 , options_url: '/admin/store/default-payment-terms-options' },
+      { name: 'auto_capture'  , nice_name: 'Capture Funds Automatically'           , type: 'checkbox'     , value: <%= raw Caboose.json(sc.auto_capture    ) %>, width: 400 }
     ]    
   });
                                                                                                                                                                                     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.221'
+  VERSION = '0.9.222'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.221
+  version: 0.9.222
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg