effective_orders 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 620fed45e324ddd47e54d737c2bc737e9eeec797
-  data.tar.gz: e7bf75ddee55b77e04ce2ae897b92d9f5b8b52dc
+  metadata.gz: e1c32ade8d8bebb1a9228624548b1ab9702e193d
+  data.tar.gz: a3b35b62b2b44f30ca4475af4e130ae7dc5d9775
 SHA512:
-  metadata.gz: 7293cfe64c1d8b4690038c61356b2861109cbfcaa055324f452f3c699247e14b8415ff6aee20ba131cd5f9fc97943213273d5cffce09b60a1b7da77b79931fd7
-  data.tar.gz: 071870737b47f189d6759ffecad0230c31dbc9b1577bce69e21d8d203d27d915fc8078ab06518e9af11279836151ef9f48b7746344f6142f8ffcdf1e585aa913
+  metadata.gz: 8a573c500321453ec640db547d37096c27f74da1de0d79ed1f4dc805c2a97b4d982f0f570e9e03ea75e510390d706f1bfe6e79f2e280e2bc081d56ecba08c2d2
+  data.tar.gz: 87cdd2c31a3a701caf49ad1e6d69c06747c63689ac92ae5a036265229df4d7b98e86c8c7460d5ce632c644fe48f742eb0261fd2573a000d6adc860f8afbaf413

data/app/controllers/effective/orders_controller.rb

@@ -162,10 +162,10 @@ module Effective
     # options:
     # flash: What flash message should be displayed
     def order_declined(details = nil, redirect_url = nil, options = {})
-      flash = options.fetch(:flash, "Payment was unsuccessful. Your credit card was declined by the payment processor. Please try again.")
+      flash_msg = options.fetch(:flash, "Payment was unsuccessful. Your credit card was declined by the payment processor. Please try again.")
 
       @order.decline!(details) rescue nil
-      flash[:danger] = flash
+      flash[:danger] = flash_msg
 
       redirect_to (redirect_url.presence || effective_orders.order_declined_path(@order)).gsub(':id', @order.id.to_s)
     end

data/app/models/effective/order.rb

@@ -328,8 +328,10 @@ module Effective
       begin
         if EffectiveOrders.mailer[:delayed_job_deliver] && EffectiveOrders.mailer[:deliver_method] == :deliver_later
           (OrdersMailer.delay.public_send(email, *mailer_args) rescue false)
-        else
+        elsif EffectiveOrders.mailer[:deliver_method].present?
           (OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method]) rescue false)
+        else
+          (OrdersMailer.public_send(email, *mailer_args).deliver_now) rescue false
         end
       rescue => e
         raise e unless Rails.env.production?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.1'.freeze
 end

data/spec/controllers/orders_controller_spec.rb

@@ -352,7 +352,8 @@ describe Effective::OrdersController, type: :controller do
       post :create, valid_order_attributes
 
       expect { Effective::Cart.find(cart.id) }.to raise_error(ActiveRecord::RecordNotFound)
-      assigns(:cart).cart_items.size.should eq 0
+      ci_ids = assigns(:cart).cart_items.collect(&:id)
+      expect(Effective::CartItem.where(:id => ci_ids).count).to be 0
     end
 
     it 'redirects to the purchased page' do

data/spec/dummy/config/initializers/effective_orders.rb

@@ -138,6 +138,7 @@ EffectiveOrders.setup do |config|
     :subject_for_admin_receipt => '',
     :subject_for_buyer_receipt => '',
     :subject_for_seller_receipt => '',
+    :deliver_method => :deliver_now,
     :delayed_job_deliver => false
   }
 
@@ -153,8 +154,8 @@ EffectiveOrders.setup do |config|
     }
   else
     config.moneris = {
-      :ps_store_id => '',
-      :hpp_key => '',
+      :ps_store_id => 'foo',
+      :hpp_key => 'bar',
       :hpp_url => 'https://esqa.moneris.com/HPPDP/index.php',
       :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php'
     }
@@ -176,9 +177,9 @@ EffectiveOrders.setup do |config|
     }
   else
     config.paypal = {
-      :seller_email => '',
-      :secret => '',
-      :cert_id => '',
+      :seller_email => 'seller@mail.com',
+      :secret => 'foo',
+      :cert_id => 'bar',
       :paypal_url => 'https://www.sandbox.paypal.com/cgi-bin/webscr',
       :currency => 'CAD',
       :paypal_cert => "#{Rails.root}/config/paypalcerts/#{Rails.env}/paypal_cert.pem",
@@ -204,12 +205,12 @@ EffectiveOrders.setup do |config|
     }
   else
     config.stripe = {
-      :secret_key => '',
-      :publishable_key => '',
+      :secret_key => 'foo',
+      :publishable_key => 'bar',
       :currency => 'usd',
       :site_title => 'My Development Site',  # Displayed on the Embedded Stripe Form
-      :site_image => '', # A relative URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
-      :connect_client_id => ''
+      :site_image => 'foo', # A relative URL pointing to a square image of your brand or product. The recommended minimum size is 128x128px.
+      :connect_client_id => 'bar'
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails