effective_orders 6.31.1 → 6.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c62c3eb38a3780a63ad16a9aac9f9f1f37aa58663f778e3df35bf9e83ca648
-  data.tar.gz: f5d65649c5ff1eb7b24a8586e4b8f0730f973d93b6476b6517217b8d4a2f0ae0
+  metadata.gz: 97d5089149494797ab6704bc03da3919a04619ceffe9e51c2f81de5343c6d525
+  data.tar.gz: d4dc29472beac39508adf8bf61c991380b5626a0ad2227b55897b51c500221c0
 SHA512:
-  metadata.gz: e946fa94430f0272e8cd9a21b8bfd6b63813915f6984b5bed85fabe2f3839c5f919efc8899a20d057a43bd83d96e06fb5c1330c3795fedb6dcd059f75ab8ed42
-  data.tar.gz: 9e4d1879e0dadb6fb5a3ea505219aeb87f1d310c609c154a73355c6d5e2603225e28dc30960757a73800c1251355305d6526d4e0973e3544c18ea7aa8c936385
+  metadata.gz: 8508e2cdc5ea25f4d5400f5f1cd8a3b7933179114cfca1005a67ec985094e05091b429223dc215e75286f05ee7abb1bdf815b3be637aa3e218b8e7e722325702
+  data.tar.gz: 31b5c5a272bf5431012f65390a898f8ca6cab6a8d304a023e4829aaa9ca04e686dc5645808141f05a680489691973cc9d8315099c433d8a35b461c75971bc639

data/app/controllers/effective/orders_controller.rb

@@ -24,8 +24,10 @@ module Effective
       layout(config.kind_of?(Hash) ? (config[:orders] || config[:application]) : config)
     end
 
+    rate_limit to: 5, within: 1.hour, by: -> { current_user&.id }, only: :checkout
+
     before_action :authenticate_user!, except: [:free, :paypal_postback, :moneris_postback, :pretend]
-    before_action :set_page_title, except: [:show, :edit]
+    before_action :set_page_title, except: [:show, :edit, :checkout]
 
     before_action :verify_recaptcha_checkout!, only: [
       :cheque, :deluxe, :deluxe_delayed, :etransfer, :free, :helcim, :mark_as_paid, :moneris_checkout, :phone, :pretend, :refund, :stripe
@@ -57,25 +59,30 @@ module Effective
       @order.assign_attributes(checkout_params)
 
       if (@order.confirm! rescue false)
-        redirect_to(effective_orders.order_path(@order))
+        redirect_to(effective_orders.checkout_order_path(@order))
       else
         flash.now[:danger] = "Unable to proceed: #{flash_errors(@order)}. Please try again."
         render :new
       end
     end
 
-    # If you want to use the order = Effective::Order.new(@thing); order.save! flow
-    # Add one or more items to the order.
-    # redirect_to effective_orders.order_path(order), which is here
-    # This is the entry point for an existing order.
-    # Might render step1 or step2
+    # Displays the order summary.
+    # For unpurchased orders, shows a Checkout button.
+    # For purchased orders, shows a Continue button.
     def show
       @order ||= Effective::Order.deep.find(params[:id])
-      @page_title ||= view_context.order_page_title(@order)
+      @page_title ||= @order.to_s
 
       EffectiveResources.authorize!(self, :show, @order)
     end
 
+    def checkout
+      @order ||= Effective::Order.deep.was_not_purchased.find(params[:id])
+      @page_title ||= 'Checkout'
+
+      EffectiveResources.authorize!(self, :checkout, @order)
+    end
+
     # Always step1
     def edit
       @order ||= Effective::Order.deep.was_not_purchased.find(params[:id])
@@ -92,7 +99,7 @@ module Effective
       @order.assign_attributes(checkout_params)
 
       if (@order.confirm! rescue false)
-        redirect_to(effective_orders.order_path(@order))
+        redirect_to(effective_orders.checkout_order_path(@order))
       else
         flash.now[:danger] = "Unable to proceed: #{flash_errors(@order)}. Please try again."
         render :edit
@@ -154,7 +161,7 @@ module Effective
       @order = Effective::Order.not_purchased.find(params[:id])
       EffectiveResources.authorize!(self, :update, @order)
 
-      redirect_url = params[:redirect_url].presence || effective_orders.order_path(@order)
+      redirect_url = params[:redirect_url].presence || effective_orders.checkout_order_path(@order)
 
       if verify_recaptcha(secret_key: EffectiveOrders.recaptcha_secret_key)
         session[:recaptcha_verified_order_id] = @order.id
@@ -187,7 +194,7 @@ module Effective
 
       unless session[:recaptcha_verified_order_id].to_s == params[:id].to_s
         flash[:danger] = 'Please complete the verification to proceed with payment.'
-        redirect_back(fallback_location: effective_orders.order_path(params[:id]))
+        redirect_back(fallback_location: effective_orders.checkout_order_path(params[:id]))
       end
     end
 

data/app/helpers/effective_orders_helper.rb

@@ -86,15 +86,7 @@ module EffectiveOrdersHelper
   def order_page_title(order)
     raise 'expected an order' unless order.kind_of?(Effective::Order)
 
-    authorized = EffectiveResources.authorized?(self, :update, order)
-
-    if order.purchased? || order.declined?
-      order.to_s
-    elsif authorized && (controller.action_name == 'edit')
-      'Order Review'
-    elsif authorized && (order.confirmed? || order.deferred?) && order.errors.blank?
-      'Checkout'
-    elsif authorized && order.pending?
+    if controller.action_name == 'edit'
       'Order Review'
     else
       order.to_s

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

@@ -13,7 +13,7 @@
 
 - else
   - # Show this if I'm on the effective orders checkout screen. But not on a rendered order.
-  - if order.persisted? && order.user == current_user && request.path.to_s.start_with?(effective_orders.order_path(order))
+  - if order.persisted? && order.user == current_user && (request.path.to_s.start_with?(effective_orders.order_path(order)) || request.path.to_s.start_with?(effective_orders.checkout_order_path(order)))
     .effective-order-change-items
       = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow
 

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

@@ -1,6 +1,6 @@
 = dropdown(variation: :dropleft) do
   - if EffectiveResources.authorized?(controller, :checkout, order)
-    = dropdown_link_to 'Checkout', effective_orders.order_path(order), 'data-turbolinks': false
+    = dropdown_link_to 'Checkout', effective_orders.checkout_order_path(order), 'data-turbolinks': false
   - else
     = dropdown_link_to 'Show', effective_orders.order_path(order)
 

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

@@ -0,0 +1,3 @@
+= render 'layout' do
+  %h1.effective-heading= @page_title
+  = render_checkout(@order)

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

@@ -8,4 +8,4 @@
       Please try again.
 
   %p.text-center
-    = link_to 'Continue', root_path, class: 'btn btn-primary'
+    = link_to 'Continue', effective_orders.checkout_order_path(@order), class: 'btn btn-primary'

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

@@ -1,10 +1,10 @@
 = render 'layout' do
   %h1.effective-heading= @page_title
+  = render(@order)
 
   - if EffectiveResources.authorized?(self, :checkout, @order)
-    = render_checkout(@order)
+    %p.text-center
+      = link_to 'Checkout', effective_orders.checkout_order_path(@order), class: 'btn btn-primary'
   - else
-    = render(@order)
-
     %p.text-center
       = link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'

data/config/routes.rb

@@ -4,6 +4,7 @@ EffectiveOrders::Engine.routes.draw do
   scope module: 'effective' do
     resources :orders, except: [:destroy] do
       member do
+        get :checkout
         get :purchased
         get :deferred
         get :declined

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.31.1'.freeze
+  VERSION = '6.32.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.31.1
+  version: 6.32.0
 platform: ruby
 authors:
 - Code and Effect
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +316,7 @@ files:
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_orders_table.html.haml
 - app/views/effective/orders/_purchasables.html.haml
+- app/views/effective/orders/checkout.html.haml
 - app/views/effective/orders/cheque/_form.html.haml
 - app/views/effective/orders/declined.html.haml
 - app/views/effective/orders/deferred.html.haml