effective_orders 4.2.6 → 4.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19a1e1d922e08fadb09424738cfd86ae5c12db5e7553cbed17d4fb8a55ca57e
-  data.tar.gz: 0d65f0bbb387bbf804296a30f6822459bae66cdbd0053f82104f08af9d9b8c99
+  metadata.gz: f0bd383b484e3db946b0a7bb199f7afb8d7d8600019dcfad46b00bf6ddb3d798
+  data.tar.gz: 16db4fd12e60d5995ec3dbc9003a720dacc8e9c95b761c622ac7c7db294ea77b
 SHA512:
-  metadata.gz: 5ca8aa77355e8edfcb23834ff7f735f1ce3d775869ae9c6682d062b5fa4e0189e3afd7f29745d04abbd82d712b8272ec188cec8d210f8f8b23ec00d2ef0ff850
-  data.tar.gz: a4c3b95cfedd8600438a08e1f1b3ed93665e0f8ac45267ed6716a55079df483c731b2ffd4ce287a6d46488a4ccc8b9ec2ba04751f6d3e8338f04f84d0a0d5d45
+  metadata.gz: 19022b230c19a97bc5c1c9a203df1407c86be04b802f01b157929ba6204e8bf60ba9dd3967e32c992fa95a6bbf75aa30ac8781b79fb789f4b2dd37117b002541
+  data.tar.gz: 2808d79b39ecae2b23bf2fd17cc9ed36085f11103d8d217eba454fa1508207d81331c4241a25e8a92c03ba604a18f93197028d9e7adad74d018be7a8d2fabd48

data/app/assets/javascripts/effective_orders/providers/stripe.js.coffee

@@ -16,7 +16,7 @@ $(document).on 'click', "#effective-orders-new-charge-form form [type='submit']"
   $form = obj.find('form').first()
   stripe = obj.data('stripe')
 
-  EffectiveBootstrap.submitting($form)
+  EffectiveForm.submitting($form)
 
   stripeCheckoutHandler(stripe.key, $form).open
     image: stripe.image

data/app/models/effective/order.rb

@@ -21,6 +21,7 @@ module Effective
     )
 
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
+    attr_accessor :confirmed_checkout   # Set on the Checkout Step 1
 
     # Settings in the /admin action forms
     attr_accessor :send_payment_request_to_buyer # Set by Admin::Orders#new. Should the payment request email be sent after creating an order?
@@ -61,6 +62,10 @@ module Effective
     before_validation { assign_billing_name }
     before_validation { assign_last_address }
 
+    before_validation(if: -> { confirmed_checkout }) do
+      self.state = EffectiveOrders::CONFIRMED if pending?
+    end
+
     # Order validations
     validates :user_id, presence: true
     validates :order_items, presence: { message: 'No items are present. Please add additional items.' }
@@ -75,41 +80,41 @@ module Effective
     end
 
     # User validations -- An admin skips these when working in the admin/ namespace
-    with_options unless: -> { pending? || skip_buyer_validations? } do |order|
-      order.validates :tax_rate, presence: { message: "can't be determined based on billing address" }
-      order.validates :tax, presence: true
+    with_options unless: -> { pending? || skip_buyer_validations? } do
+      validates :tax_rate, presence: { message: "can't be determined based on billing address" }
+      validates :tax, presence: true
 
       unless EffectiveOrders.skip_user_validation
-        order.validates :billing_name, presence: true
-        order.validates :user, associated: true
+        validates :billing_name, presence: true
+        validates :user, associated: true
       end
 
       if EffectiveOrders.billing_address
-        order.validates :billing_address, presence: true
+        validates :billing_address, presence: true
       end
 
       if EffectiveOrders.shipping_address
-        order.validates :shipping_address, presence: true
+        validates :shipping_address, presence: true
       end
 
       if EffectiveOrders.collect_note_required
-        order.validates :note, presence: true
+        validates :note, presence: true
       end
     end
 
-    with_options if: -> { confirmed? && !skip_buyer_validations? } do |order|
+    with_options if: -> { confirmed? && !skip_buyer_validations? } do
       if EffectiveOrders.terms_and_conditions
-        order.validates :terms_and_conditions, presence: true
+        validates :terms_and_conditions, presence: true
       end
     end
 
     # When Purchased
-    with_options if: -> { purchased? } do |order|
-      order.validates :purchased_at, presence: true
-      order.validates :payment, presence: true
+    with_options if: -> { purchased? } do
+      validates :purchased_at, presence: true
+      validates :payment, presence: true
 
-      order.validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.payment_providers }
-      order.validates :payment_card, presence: true
+      validates :payment_provider, presence: true, inclusion: { in: EffectiveOrders.payment_providers }
+      validates :payment_card, presence: true
     end
 
     scope :deep, -> { includes(:user, order_items: :purchasable) }

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

@@ -1,34 +1,4 @@
 .effective-order
   = effective_form_with(model: order, url: checkout_step1_form_url(order, namespace)) do |f|
-    = render partial: 'effective/orders/order_notes', locals: { order: order }
-    = render partial: 'effective/orders/order_items', locals: { order: order }
-
-    - if current_cart.present?
-      .effective-order-change-items
-        = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-secondary'
-
-    - if EffectiveOrders.collect_user_fields.present? && f.object.user.present?
-      = render partial: 'effective/orders/order_user_fields', locals: { form: f, user: f.object.user }
-
-    - num_addresses = [EffectiveOrders.billing_address, EffectiveOrders.shipping_address].count(true)
-
-    - if num_addresses > 0
-      .effective-order-addresses
-        .row
-          - if EffectiveOrders.billing_address
-            %div{class: "col-md-#{12 / num_addresses}"}
-              %h2 Billing Address
-              = effective_address_fields(f, :billing_address)
-
-          - if EffectiveOrders.shipping_address
-            %div{class: "col-md-#{12 / num_addresses}"}
-              %h2 Shipping Address
-              = effective_address_fields(f, :shipping_address)
-
-    - if EffectiveOrders.collect_note
-      = render partial: 'effective/orders/order_note_fields', locals: { form: f }
-
-    - if EffectiveOrders.terms_and_conditions
-      = render partial: 'effective/orders/order_terms_and_conditions_fields', locals: { form: f }
-
+    = render('effective/orders/fields', order: order, form: f)
     = f.submit 'Proceed to Checkout'

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

@@ -0,0 +1,34 @@
+- form ||= local_assigns[:form] || local_assigns[:f]
+
+= render 'effective/orders/order_notes', order: form.object
+= render 'effective/orders/order_items', order: form.object
+
+= form.hidden_field :confirmed_checkout, value: true
+
+- if current_cart.present?
+  .effective-order-change-items
+    = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow, class: 'btn btn-secondary'
+
+- if EffectiveOrders.collect_user_fields.present? && form.object.user.present?
+  = render 'effective/orders/order_user_fields', form: form, user: form.object.user
+
+- num_addresses = [EffectiveOrders.billing_address, EffectiveOrders.shipping_address].count(true)
+
+- if num_addresses > 0
+  .effective-order-addresses
+    .row
+      - if EffectiveOrders.billing_address
+        %div{class: "col-md-#{12 / num_addresses}"}
+          %h2 Billing Address
+          = effective_address_fields(form, :billing_address)
+
+      - if EffectiveOrders.shipping_address
+        %div{class: "col-md-#{12 / num_addresses}"}
+          %h2 Shipping Address
+          = effective_address_fields(form, :shipping_address)
+
+- if EffectiveOrders.collect_note
+  = render 'effective/orders/order_note_fields', form: form
+
+- if EffectiveOrders.terms_and_conditions
+  = render 'effective/orders/order_terms_and_conditions_fields', form: form

data/lib/effective_orders.rb

@@ -89,7 +89,7 @@ module EffectiveOrders
 
   def self.permitted_params
     [
-      :note, :terms_and_conditions,
+      :note, :terms_and_conditions, :confirmed_checkout,
       billing_address: EffectiveAddresses.permitted_params,
       shipping_address: EffectiveAddresses.permitted_params,
       user_attributes: (EffectiveOrders.collect_user_fields || []),

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.2.6'.freeze
+  VERSION = '4.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.2.6
+  version: 4.2.7
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -190,6 +190,7 @@ files:
 - app/views/effective/orders/_checkout_actions.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
+- app/views/effective/orders/_fields.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
 - app/views/effective/orders/_order_footer.html.haml