effective_orders 6.5.2 → 6.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd209b4bfdd333ea96dfa7c850a3d136738b8bb355547707d389521dfad03c2
-  data.tar.gz: 2df312bdfb0ecb45095f2dd7067f95f091e3fe0247cfdb44957de1b517eb52ef
+  metadata.gz: 9556f1f1d36f6ec955075b18a44d4ab62a89d5e9197ed96b7a74e0a9359dc3df
+  data.tar.gz: a21e9a22e9d90d6e1fe75aa76c521d21f7f42d8cee51248d0aacf9ba3aa7a6bc
 SHA512:
-  metadata.gz: f4d65e073900587f76a08122998cb06d84da8df4006226fb5fd6c272015c277e9440d8719a989b563d5795743fe4a23f0a06cc004d57ed5dd19f4547d544cb8b
-  data.tar.gz: 630ce183e1a5691800eec6ad28fedb074fa6a17dcbb05ff85e8c1f671df5148cd075c09d02193b0ea93bbd77e026fa07af325694e69668e9c9441c87e8ec3ff4
+  metadata.gz: a9878d9e12edd59fefc4b4654d54591f1e0bea8b22a833f933086e058b1de81ce3c1907d76522318457ca4181086bd4fc8563dd078cf0e5baf858f99bf7cf259
+  data.tar.gz: 6a86937f2081ed04e7b8b10ede3e9511bd5c84dee08e8a19c35098c68ec39d9b0d152a877ab7156254feb1c3e351c6831f55700d93d41b6c14428be298fa209d

data/app/assets/stylesheets/effective_orders/_order.scss

@@ -38,6 +38,7 @@
 }
 
 .effective-order-change-items {
+  text-align: right;
   margin-bottom: 1rem;
 }
 
@@ -52,7 +53,7 @@ form.new_effective_order {
 }
 
 .effective-moneris-checkout {
-  height: 720px;
+  height: 560px;
 }
 
 @media print {

data/app/controllers/effective/orders_controller.rb

@@ -62,14 +62,16 @@ module Effective
     # Might render step1 or step2
     def show
       @order = Effective::Order.find(params[:id])
-      EffectiveResources.authorize!(self, :show, @order)
+      @page_title ||= view_context.order_page_title(@order)
 
-      @page_title ||= ((@order.user == current_user && !@order.purchased?) ? 'Checkout' : @order.to_s)
+      EffectiveResources.authorize!(self, :show, @order)
     end
 
     # Always step1
     def edit
       @order ||= Effective::Order.was_not_purchased.find(params[:id])
+      @page_title ||= view_context.order_page_title(@order)
+
       EffectiveResources.authorize!(self, :edit, @order)
     end
 

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

@@ -10,13 +10,22 @@ module Effective
 
         EffectiveResources.authorize!(self, :update, @order)
 
-        order_purchased(
-          payment: 'for pretend',
-          provider: 'pretend',
-          card: 'none',
-          purchased_url: pretend_params[:purchased_url],
-          current_user: current_user
-        )
+        if params[:commit].to_s.include?('Decline')
+          order_declined(
+            payment: 'for pretend', 
+            provider: 'pretend', 
+            card: 'none', 
+            declined_url: pretend_params[:declined_url]
+          )
+        else
+          order_purchased(
+            payment: 'for pretend', 
+            provider: 'pretend', 
+            card: 'none', 
+            purchased_url: pretend_params[:purchased_url],
+            current_user: current_user
+          )
+        end
       end
 
       def pretend_params

data/app/helpers/effective_orders_helper.rb

@@ -82,6 +82,24 @@ module EffectiveOrdersHelper
     render(partial: 'effective/orders/order', locals: { order: order })
   end
 
+  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?
+      'Order Review'
+    else
+      order.to_s
+    end
+  end
+
   def render_checkout(order, namespace: nil, purchased_url: nil, declined_url: nil, deferred_url: nil)
     raise 'expected an order' unless order.kind_of?(Effective::Order)
     raise 'unable to checkout an order without a user or organization' if order && (order.user.blank? && order.organization.blank?)

data/app/models/effective/order.rb

@@ -583,6 +583,12 @@ module Effective
       false
     end
 
+    # Called by effective_memberships to update prices from purchasable fees
+    # Not called internally
+    def update_purchasable_attributes
+      present_order_items.each { |oi| oi.update_purchasable_attributes }
+    end
+
     # Call this as a way to skip over non consequential orders
     # And mark some purchasables purchased
     # This is different than the Mark as Paid payment processor

data/app/models/effective/order_item.rb

@@ -37,7 +37,17 @@ module Effective
 
     # This method is called in a before_validation in order.assign_order_values()
     def assign_purchasable_attributes
-      assign_attributes(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt) if purchasable
+      return unless purchasable.present?
+
+      self.name ||= purchasable.purchasable_name
+      self.price ||= purchasable.price
+      self.tax_exempt = purchasable.tax_exempt if self.tax_exempt.nil?
+    end
+
+    def update_purchasable_attributes
+      if purchasable.present? && !marked_for_destruction?
+        assign_attributes(name: purchasable.purchasable_name, price: purchasable.price, tax_exempt: purchasable.tax_exempt)
+      end
     end
 
     def build_purchasable(atts = {})

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

@@ -1,4 +1,9 @@
-.effective-order
-  = effective_form_with(model: order, url: checkout_step1_form_url(order, namespace)) do |f|
-    = render('effective/orders/fields', order: order, form: f)
-    = f.submit 'Proceed to Checkout'
+- if current_cart.present? 
+  .effective-order-change-items
+    = link_to 'Change Items', effective_orders.cart_path, rel: :nofollow
+
+= render(order, no_order_actions: true)
+
+= effective_form_with(model: order, url: checkout_step1_form_url(order, namespace)) do |f|
+  = render('effective/orders/fields', order: order, form: f)
+  = f.submit 'Proceed to Checkout'

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

@@ -1,9 +1,9 @@
-= render partial: 'effective/orders/order', locals: { order: order }
-
 - # 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))
   .effective-order-change-items
-    = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
+    = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow
+
+= render(order, no_order_actions: true)
 
 .effective-order-purchase-actions
   - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url, deferred_url: deferred_url }

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

@@ -1,14 +1,10 @@
 - form ||= local_assigns[:form] || local_assigns[:f]
 
-= render 'effective/orders/order_notes', order: form.object
-= render 'effective/orders/order_items', order: form.object
+-# = 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'
-
 - num_addresses = [EffectiveOrders.billing_address, EffectiveOrders.shipping_address].count(true)
 
 - if num_addresses > 0

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

@@ -4,9 +4,6 @@
 
 .card
   .card-body.bg-light
-    .mb-3.text-center
-      %h2 Checkout
-
     = effective_form_with(scope: :moneris_checkout, url: effective_orders.moneris_checkout_order_path(order), data: { 'moneris-checkout-form': moneris_checkout.to_json }) do |f|
       = f.hidden_field :purchased_url, value: purchased_url
       = f.hidden_field :declined_url, value: declined_url

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

@@ -9,4 +9,6 @@
       - if EffectiveOrders.pretend_message.present?
         %p= EffectiveOrders.pretend_message
 
-      = f.submit order_checkout_label(:pretend), border: false, center: true
+      = f.submit(border: false, center: true) do
+        = f.save order_checkout_label(:pretend)
+        = f.save order_checkout_label(:pretend).gsub('Purchase', 'Decline')

data/db/migrate/01_create_effective_orders.rb.erb

@@ -48,7 +48,7 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
 
       t.string    :name
       t.integer   :quantity
-      t.integer   :price, :default => 0
+      t.integer   :price
       t.boolean   :tax_exempt
 
       t.timestamps

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.5.2'.freeze
+  VERSION = '6.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.5.2
+  version: 6.5.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails