effective_orders 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 982893ebe426c1097f68ffaccbd87a1977c5d48f4ce1a45dbbf5b13752572542
-  data.tar.gz: 1742602893eb3c98aea29e31161c05e60b67929802ed51a39c40d20fb3c4f2b3
+  metadata.gz: 55f4ecfb00c2ff8fca1e88711877ca4c4a2c5e2772857645b1793eb42d672f6d
+  data.tar.gz: 97d1e59387d065240d3b0c160f725831d808ea153d6aedce2104f277c769e005
 SHA512:
-  metadata.gz: fa41b81eba8d7c6364fe8192f3e072149562228a666cd8b7b2b41845258e1684a00947bce0b890d9f77f5887ae1a87ba377b68909c7f99d2773ac1801acd12c4
-  data.tar.gz: f7759f4669a5a66492b6dd0259d5e744d64c403775112d0577280397d4b31e2d98dd66bf764e18c4e5359b16346d22b9444ecb65b087b55c4638e2bf28eccfa2
+  metadata.gz: 74166e809d54fd9b2b0f4c266e59da9b0f8ff0947ac2166f6e88686fcaecf05a1c6e520933a935568717beae55a1db032aca72902641fbd031ecf60fe0302527
+  data.tar.gz: 464f54b750a6feab8ec0ad9df11c1b8591aa70d33a58faaf0cb03eb03d584ea4362fc9247f3ad3425e3269585cb78a18529cfc28c1ae41eadc0a28d2304f1298

data/app/controllers/effective/concerns/purchase.rb

@@ -5,28 +5,21 @@ module Effective
 
       protected
 
-      def order_purchased(payment:, provider:, card: 'none', email: true, skip_buyer_validations: false, purchased_url: nil, declined_url: nil)
-        begin
-          @order.purchase!(payment: payment, provider: provider, card: card, email: email, skip_buyer_validations: skip_buyer_validations)
-
-          Effective::Cart.where(user: @order.user).destroy_all
-
-          if flash[:success].blank?
-            if EffectiveOrders.mailer[:send_order_receipt_to_buyer] && email
-              flash[:success] = "Payment successful! A receipt has been sent to #{@order.emails_send_to}"
-            else
-              flash[:success] = "Payment successful! An email receipt has not been sent."
-            end
-          end
+      def order_purchased(payment:, provider:, card: 'none', email: true, skip_buyer_validations: false, purchased_url: nil)
+        @order.purchase!(payment: payment, provider: provider, card: card, email: email, skip_buyer_validations: skip_buyer_validations)
 
-          purchased_url ||= effective_orders.purchased_order_path(':id')
-          redirect_to purchased_url.gsub(':id', @order.to_param.to_s)
-        rescue => e
-          flash[:danger] = "An error occurred while processing your payment: #{e.message}. Please try again."
+        Effective::Cart.where(user: @order.user).destroy_all
 
-          declined_url ||= effective_orders.declined_order_path(':id')
-          redirect_to declined_url.gsub(':id', @order.to_param.to_s)
+        if flash[:success].blank?
+          if email && EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+            flash[:success] = "Payment successful! A receipt has been sent to #{@order.emails_send_to}"
+          else
+            flash[:success] = "Payment successful! An email receipt has not been sent."
+          end
         end
+
+        purchased_url ||= effective_orders.purchased_order_path(':id')
+        redirect_to purchased_url.gsub(':id', @order.to_param.to_s)
       end
 
       def order_deferred(provider:, email: true, deferred_url: nil)

data/app/controllers/effective/orders_controller.rb

@@ -1,5 +1,6 @@
 module Effective
   class OrdersController < ApplicationController
+    include Effective::CrudController
     include Concerns::Purchase
 
     include Providers::Cheque
@@ -12,8 +13,6 @@ module Effective
     include Providers::Refund
     include Providers::Stripe
 
-    include Effective::CrudController
-
     if (config = EffectiveOrders.layout)
       layout(config.kind_of?(Hash) ? (config[:orders] || config[:application]) : config)
     end

data/app/controllers/effective/providers/free.rb

@@ -21,7 +21,6 @@ module Effective
           provider: 'free',
           card: 'none',
           purchased_url: free_params[:purchased_url],
-          declined_url: free_params[:declined_url],
           email: false
         )
       end

data/app/controllers/effective/providers/mark_as_paid.rb

@@ -19,8 +19,7 @@ module Effective
           card: mark_as_paid_params[:payment_card],
           email: @order.send_mark_as_paid_email_to_buyer?,
           skip_buyer_validations: true,
-          purchased_url: effective_orders.admin_order_path(@order),
-          declined_url: effective_orders.admin_order_path(@order)
+          purchased_url: effective_orders.admin_order_path(@order)
         )
       end
 

data/app/controllers/effective/providers/pretend.rb

@@ -14,8 +14,7 @@ module Effective
           payment: 'for pretend',
           provider: 'pretend',
           card: 'none',
-          purchased_url: pretend_params[:purchased_url],
-          declined_url: pretend_params[:declined_url]
+          purchased_url: pretend_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/providers/refund.rb

@@ -21,8 +21,7 @@ module Effective
         order_purchased(
           payment: 'refund. no payment required.',
           provider: 'refund',
-          purchased_url: refund_params[:purchased_url],
-          declined_url: refund_params[:declined_url]
+          purchased_url: refund_params[:purchased_url]
         )
       end
 

data/app/controllers/effective/providers/stripe.rb

@@ -26,8 +26,7 @@ module Effective
           payment: payment,
           provider: 'stripe',
           card: payment[:card],
-          purchased_url: stripe_params[:purchased_url],
-          declined_url: stripe_params[:declined_url]
+          purchased_url: stripe_params[:purchased_url]
         )
       end
 

data/app/datatables/effective_orders_datatable.rb

@@ -6,8 +6,6 @@ class EffectiveOrdersDatatable < Effective::Datatable
       scope :purchased, default: true
       scope :deferred
       scope :refunds
-      scope :not_purchased
-      scope :all
     end
   end
 
@@ -79,7 +77,7 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   def user
-    @user ||= current_user.class.find(attributes[:user_id])
+    @user ||= view.current_user.class.find(attributes[:user_id])
   end
 
 end

data/app/helpers/effective_orders_helper.rb

@@ -107,13 +107,7 @@ module EffectiveOrdersHelper
     end
   end
 
-  def render_orders(obj, opts = {})
-    orders = Array(obj.kind_of?(User) ? Effective::Order.purchased_by(obj) : obj)
-
-    if orders.any? { |order| order.kind_of?(Effective::Order) == false }
-      raise 'expected a User or Effective::Order'
-    end
-
+  def render_orders(orders, opts = {})
     render(partial: 'effective/orders/orders_table', locals: { orders: orders }.merge(opts))
   end
 

data/app/models/effective/order.rb

@@ -362,38 +362,31 @@ module Effective
 
     # Effective::Order.new(items: Product.first, user: User.first).purchase!(email: false)
     def purchase!(payment: 'none', provider: 'none', card: 'none', email: true, skip_buyer_validations: false)
-      return false if purchased?
-      error = nil
-
-      assign_attributes(
-        state: EffectiveOrders::PURCHASED,
-        payment: payment_to_h(payment),
-        payment_provider: provider,
-        payment_card: (card.presence || 'none'),
-        skip_buyer_validations: skip_buyer_validations
-      )
+      # Assign attributes
+      self.state = EffectiveOrders::PURCHASED
+      self.skip_buyer_validations = skip_buyer_validations
 
+      self.payment_provider ||= provider
+      self.payment_card ||= (card.presence || 'none')
       self.purchased_at ||= Time.zone.now
+      self.payment = payment_to_h(payment) if self.payment.blank?
 
-      Effective::Order.transaction do
-        begin
+      begin
+        Effective::Order.transaction do
           run_purchasable_callbacks(:before_purchase)
           save!
           update_purchasables_purchased_order!
-        rescue => e
-          self.state = state_was
-          self.purchased_at = nil
-
-          error = e.message
-          raise ::ActiveRecord::Rollback
         end
-      end
+      rescue => e
+        Effective::Order.transaction do
+          save!(validate: false)
+          update_purchasables_purchased_order!
+        end
 
-      raise "Failed to purchase order: #{error || errors.full_messages.to_sentence}" unless error.nil?
+        raise(e)
+      end
 
       run_purchasable_callbacks(:after_purchase)
-
-      send_refund_notification! if email && refund?
       send_order_receipts! if email
 
       true
@@ -456,6 +449,7 @@ module Effective
     def send_order_receipts!
       send_order_receipt_to_admin! if EffectiveOrders.mailer[:send_order_receipt_to_admin]
       send_order_receipt_to_buyer! if EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+      send_refund_notification! if refund?
     end
 
     def send_order_receipt_to_admin!

data/app/models/effective/product.rb

@@ -4,6 +4,8 @@ module Effective
 
     acts_as_purchasable
 
+    # belongs_to :purchased_order_id
+
     effective_resource do
       name          :string
       qb_item_name  :string

data/app/views/effective/orders/_order_actions.html.haml

@@ -3,7 +3,7 @@
     = link_to 'Print', '#', class: 'btn btn-primary print-button', data: { role: 'print-button' }, onClick: 'window.print(); false;'
 
   - if order.purchased?
-    = link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
+    = link_to 'E-mail Receipt', effective_orders.send_buyer_receipt_order_path(order),
       class: 'btn btn-secondary',
       data: { confirm: "Send receipt to #{order.emails_send_to}?" }
 

data/app/views/effective/orders/show.html.haml

@@ -4,3 +4,7 @@
   = render_checkout(@order)
 - else
   = render @order
+
+%hr
+
+= link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.0.2'.freeze
+  VERSION = '5.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails