effective_orders 5.0.0 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f8f7d52a67d1ce51884188e1731619ec49e06862122a47c7ef6453a53b1a841
-  data.tar.gz: f6326e488f80799a0b5425d319a0a576053a5f73d51967931d1b0b58281b5ce5
+  metadata.gz: 195cc9c586145c7c43e3765a482e6f843926b9beb4043e437960602cec6dc87d
+  data.tar.gz: 5feb696f017b304b3ce0f4cb63eb529cbbcb61616822af3ce97b405caa68f149
 SHA512:
-  metadata.gz: f21b668907138f9d2257215ee2446064bceaccfe69bb4553923fac8c018f0309cf050a4aa26322d37bde38b67de363057cbdc5982bb30c085f09e4dae5b4dcca
-  data.tar.gz: 5d78b1895cd76eafbb041324e5bc4be940a191c8d5a48ea3f5458af1d72c05b1cea9dafd0fbdab41bf56105a8f6ae0b28b5bb4ee9f47e7243c8fe76d04e25533
+  metadata.gz: 559e82ca80af432a84c99fadfe16ebf413f7c39725ba652568828f88cd91a4e1853adf86e327feb06df9b7e6a9e2916be3b96519847b905fef7b09162415f4cb
+  data.tar.gz: 4bc2f1e00f75619f168c76d6d8b4a2716baee26dc6fe734bea1b7ff35faf781a4a33f908175e472f62032196a077baf1c5c84ab2f0366dbf1ca0012466936732

data/README.md

@@ -351,7 +351,10 @@ The permissions you actually want to define for a regular user are as follows (u
 
 ```ruby
 can [:manage], Effective::Cart, user_id: user.id
+
 can [:manage], Effective::Order, user_id: user.id # Orders cannot be deleted
+cannot [:edit, :update], Effective::Order, state: 'purchased'
+
 can [:manage], Effective::Subscription, user_id: user.id
 ```
 

data/app/assets/config/effective_orders_manifest.js

@@ -0,0 +1 @@
+//= link_directory ../images/effective_orders

data/app/controllers/admin/orders_controller.rb

@@ -50,7 +50,7 @@ module Admin
     # The show page posts to this action
     # See Effective::OrdersController checkout
     def checkout
-      @order = Effective::Order.find(params[:id])
+      @order = Effective::Order.not_purchased.find(params[:id])
 
       authorize_effective_order!
 

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
@@ -68,13 +67,13 @@ module Effective
 
     # Always step1
     def edit
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :edit, @order)
     end
 
     # Confirms the order from existing order
     def update
-      @order ||= Effective::Order.find(params[:id])
+      @order ||= Effective::Order.not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :update, @order)
 
       @order.assign_attributes(checkout_params)
@@ -110,7 +109,7 @@ module Effective
     end
 
     def send_buyer_receipt
-      @order = Effective::Order.find(params[:id])
+      @order = Effective::Order.purchased.find(params[:id])
       EffectiveResources.authorize!(self, :show, @order)
 
       if @order.send_order_receipt_to_buyer!

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/admin/effective_orders_datatable.rb

@@ -14,12 +14,12 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    if attributes[:user_id].blank? && attributes[:parent_id].blank?
-      scope :purchased, default: true
+    unless attributes[:skip_filters]
+      scope :all
+      scope :purchased
       scope :deferred
       scope :refunds
       scope :not_purchased
-      scope :all
     end
   end
 
@@ -84,13 +84,14 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.includes(:addresses, :order_items, :user)
+    scope = Effective::Order.all.deep
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
     if attributes[:user_id].present?
+      user = current_user.class.find(attributes[:user_id])
       scope = scope.where(user: user)
     end
 
@@ -101,8 +102,4 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= current_user.class.find(attributes[:user_id])
-  end
-
 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
 
@@ -61,7 +59,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.where(user: user).includes(:addresses, :order_items, :user)
+    user = current_user.class.find(attributes[:user_id])
+
+    scope = Effective::Order.all.deep.where(user: user)
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
@@ -78,8 +78,4 @@ class EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= 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

@@ -34,10 +34,6 @@ module Effective
     belongs_to :user, polymorphic: true, validate: false  # This is the buyer/user of the order. We validate it below.
     has_many :order_items, -> { order(:id) }, inverse_of: :order, dependent: :delete_all
 
-    if defined?(EffectiveQbSync)
-      has_one :qb_order_item
-    end
-
     accepts_nested_attributes_for :order_items, allow_destroy: false, reject_if: :all_blank
     accepts_nested_attributes_for :user, allow_destroy: false, update_only: true
 
@@ -78,6 +74,10 @@ module Effective
       self.state = EffectiveOrders::CONFIRMED if pending?
     end
 
+    before_save(if: -> { state_was == EffectiveOrders::PURCHASED }) do
+      raise EffectiveOrders::AlreadyPurchasedException.new('cannot unpurchase an order') unless purchased?
+    end
+
     # Order validations
     validates :user_id, presence: true
     validates :email, presence: true, email: true  # email and cc validators are from effective_resources
@@ -137,7 +137,7 @@ module Effective
       validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.deferred_providers }
     end
 
-    scope :deep, -> { includes(:user, order_items: :purchasable) }
+    scope :deep, -> { includes(:addresses, :user, order_items: :purchasable) }
     scope :sorted, -> { order(:id) }
 
     scope :purchased, -> { where(state: EffectiveOrders::PURCHASED) }
@@ -261,12 +261,6 @@ module Effective
       end
     end
 
-    # first or build
-    def qb_item_name
-      raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
-      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
-    end
-
     def pending?
       state == EffectiveOrders::PENDING
     end
@@ -338,6 +332,8 @@ module Effective
     # It skips any address or bad user validations
     # It's basically the same as save! on a new order, except it might send the payment request to buyer
     def pending!
+      return false if purchased?
+
       self.state = EffectiveOrders::PENDING
       self.addresses.clear if addresses.any? { |address| address.valid? == false }
       save!
@@ -348,6 +344,7 @@ module Effective
 
     # Used by admin checkout only
     def confirm!
+      return false if purchased?
       update!(state: EffectiveOrders::CONFIRMED)
     end
 
@@ -365,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
@@ -459,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/order_item.rb

@@ -5,6 +5,10 @@ module Effective
     belongs_to :order
     belongs_to :purchasable, polymorphic: true
 
+    if defined?(EffectiveQbSync)
+      has_one :qb_order_item
+    end
+
     effective_resource do
       name                  :string
       quantity              :integer
@@ -61,5 +65,11 @@ module Effective
       end
     end
 
+    # first or build
+    def qb_item_name
+      raise('expected EffectiveQbSync gem') unless defined?(EffectiveQbSync)
+      (qb_order_item || build_qb_order_item(name: purchasable.qb_item_name)).name
+    end
+
   end
 end

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/engine.rb

@@ -16,8 +16,8 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
-    initializer "effective_orders.append_precompiled_assets" do |app|
-      Rails.application.config.assets.precompile += ['effective_orders/*']
+    initializer 'effective_orders.assets' do |app|
+      app.config.assets.precompile += ['effective_orders_manifest.js', 'effective_orders/*']
     end
 
     initializer 'effective_orders.refund', after: :load_config_initializers do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.0.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/assets/config/effective_orders_manifest.js
 - app/assets/images/effective_orders/stripe.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee