effective_orders 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79642ded2e176dd43991e456466b69110f2e36ca107a9d49b5e1267ab57ed580
-  data.tar.gz: ec779c25f0fb3a8fcc55502105aa69e5a1d5586d2c4aedaef3bdbe4ad6194df3
+  metadata.gz: c63ea13e03cd733ba8ee14f51ab78df6fbbfc25f4b6546d946b20facfa15aaa6
+  data.tar.gz: 1a5c4d4ca4ce70f3c20c8984cfe2063104908c292f7b37a8ebb0e209c2e60e58
 SHA512:
-  metadata.gz: 3fabbafe0cb9d7a3dc19e559f369ffc90a5a11fb3da6388bea46d6a9ea42255973f2b7467fadaa0b6e5d6752e56f788b422f9483612c25aeb581ff18d4b50a6f
-  data.tar.gz: 2caec2a2464df534b68004d4050f7ab1d638c6c5c831b7a172dce582b64b61bf0c23fdd25dc517e316d3868e3d7973e6250735a91e4275f9d4180aacc1f607f7
+  metadata.gz: 9e66345b50629cd33f2e046d910d3d5cf10f735d730e3810c919cfe8fae0fff6731ff85370d2184104898441d9bcc58e7d0bbbdbe06194182e58e70e4d92636d
+  data.tar.gz: 7f6a851d15695bea583d3ba315e2df215df31be66e1bf3d8d46766ffbf500e111bce198be45b4b947373fac3776d3a1c7dfe1827c60b36efd3bba38c5293d5d9

data/app/controllers/effective/orders_controller.rb

@@ -56,6 +56,7 @@ module Effective
       Effective::Order.transaction do
         begin
           @order.save!
+          set_redirect_cookie!
           redirect_to(effective_orders.order_path(@order)) and return
         rescue => e
           raise ActiveRecord::Rollback
@@ -80,6 +81,8 @@ module Effective
       Effective::Order.transaction do
         begin
           @order.save!
+          set_redirect_cookie!
+
           redirect_to(effective_orders.order_path(@order)) and return
         rescue => e
           raise ActiveRecord::Rollback
@@ -125,6 +128,8 @@ module Effective
         Effective::Order.purchased_by(current_user).first
       end
 
+      clear_redirect_cookie!
+
       if @order.blank?
         redirect_to(effective_orders.my_purchases_orders_path) and return
       end
@@ -138,6 +143,8 @@ module Effective
       @order = Effective::Order.find(params[:id])
       EffectiveOrders.authorize!(self, :show, @order)
 
+      clear_redirect_cookie!
+
       redirect_to(effective_orders.order_path(@order)) unless @order.declined?
     end
 
@@ -180,6 +187,25 @@ module Effective
 
     private
 
+    def set_redirect_cookie!
+      return unless @order.present?
+
+      if params[:purchased_url]
+        session["effective_orders_#{@order.id}_purchased_url"] = params[:purchased_url]
+      end
+
+      if params[:declined_url]
+        session["effective_orders_#{@order.id}_declined_url"] = params[:declined_url]
+      end
+    end
+
+    def clear_redirect_cookie!
+      return unless @order.present?
+
+      session["effective_orders_#{@order.id}_purchased_url"] = nil
+      session["effective_orders_#{@order.id}_declined_url"] = nil
+    end
+
     # StrongParameters
     def checkout_params
       params.require(:effective_order).permit(EffectiveOrders.permitted_params)

data/app/helpers/effective_orders_helper.rb

@@ -101,6 +101,9 @@ module EffectiveOrdersHelper
   def render_checkout_step2(order, namespace: nil, purchased_url: nil, declined_url: nil)
     raise 'unable to checkout an order without a user' unless order && order.user
 
+    purchased_url ||= session["effective_orders_#{order.id}_purchased_url"]
+    declined_url ||= session["effective_orders_#{order.id}_declined_url"]
+
     locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, namespace: namespace }
 
     if order.new_record? || !order.valid?

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

@@ -1,5 +1,8 @@
 .effective-order
   = simple_form_for(order, (EffectiveOrders.simple_form_options || {}).merge(url: checkout_step1_form_url(order, namespace))) do |f|
+    = hidden_field_tag(:purchased_url, purchased_url) if defined?(:purchased_url)
+    = hidden_field_tag(:declined_url, declined_url) if defined?(:declined_url)
+
     = render partial: 'effective/orders/order_items', locals: { order: order, form: f }
 
     - unless f.object.pending? || (current_cart && current_cart.blank?)

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

@@ -9,14 +9,13 @@
     %tbody
       %tr
         %td
+          - unless EffectiveOrders.use_address_full_name
+            = order.billing_name
+            %br
+
           - if order.billing_address.present?
             = render :partial => 'effective/addresses/address',
               locals: {address: order.billing_address, email: order.user.email }
-          - else
-            = order.billing_name
-            %br
-            = mail_to(order.user.email)
-            %br
 
         - if order.shipping_address.present?
           %td

data/app/views/effective/orders/pretend/_form.html.haml

@@ -1,2 +1,4 @@
-= form_tag(effective_orders.pretend_order_path(order, purchased_url: purchased_url, declined_url: declined_url), method: :post) do
+= form_tag(effective_orders.pretend_order_path(order), method: :post) do
+  = hidden_field_tag(:purchased_url, purchased_url)
+  = hidden_field_tag(:declined_url, declined_url)
   = submit_tag order_checkout_label(:pretend), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Code and Effect