effective_orders 5.0.1 → 5.1.0

data/app/helpers/effective_moneris_checkout_helper.rb

@@ -0,0 +1,65 @@
+module EffectiveMonerisCheckoutHelper
+
+  def moneris_checkout_preload_request(order)
+    # Make the Preload Request
+    params = {
+      # Required
+      environment: EffectiveOrders.moneris_checkout.fetch(:environment),
+
+      api_token: EffectiveOrders.moneris_checkout.fetch(:api_token),
+      store_id: EffectiveOrders.moneris_checkout.fetch(:store_id),
+      checkout_id: EffectiveOrders.moneris_checkout.fetch(:checkout_id),
+
+      action: :preload,
+      txn_total: price_to_currency(order.total).gsub(',', '').gsub('$', ''),
+
+      # Optional
+      order_no: order.transaction_id, # Has to be unique. This is order number, billing name and Time.now
+      cust_id: order.user_id,
+      language: 'en',
+
+      contact_details: {
+        first_name: order.billing_first_name,
+        last_name: order.billing_last_name,
+        email: order.email,
+      }
+    }
+
+    if (address = order.billing_address).present?
+      params.merge!(
+        billing_details: {
+          address_1: address.address1,
+          address_2: address.address2,
+          city: address.city,
+          province: address.state_code,
+          country: address.country_code,
+          postal_code: address.postal_code
+        }
+      )
+    end
+
+    if (address = order.shipping_address).present?
+      params.merge!(
+        shipping_details: {
+          address_1: address.address1,
+          address_2: address.address2,
+          city: address.city,
+          province: address.state_code,
+          country: address.country_code,
+          postal_code: address.postal_code
+        }
+      )
+    end
+
+    response = Effective::Http.post(EffectiveOrders.moneris_request_url, params: params)
+    preload = response['response'] if response
+
+    raise("moneris preload error #{response}") unless preload && preload['success'].to_s == 'true'
+
+    payload = {
+      environment: EffectiveOrders.moneris_checkout.fetch(:environment),
+      ticket: preload['ticket']
+    }
+  end
+
+end

data/app/helpers/effective_orders_helper.rb

@@ -42,6 +42,8 @@ module EffectiveOrdersHelper
       'Admin: Mark as Paid'
     when :moneris
       'Checkout with Credit Card'
+    when :moneris_checkout
+      'Pay Now' # Doesn't get displayed anyway
     when :paypal
       'Checkout with PayPal'
     when :phone
@@ -107,35 +109,10 @@ 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
 
-  def payment_card_label(card)
-    card = card.to_s.downcase.gsub(' ', '').strip
-
-    case card
-    when ''
-      'None'
-    when 'v', 'visa'
-      'Visa'
-    when 'm', 'mc', 'master', 'mastercard'
-      'MasterCard'
-    when 'a', 'ax', 'american', 'americanexpress'
-      'American Express'
-    when 'd', 'discover'
-      'Discover'
-    else
-      card.to_s
-    end
-  end
-
   def checkout_icon_to(path, options = {})
     icon_to('shopping-cart', path, { title: 'Checkout' }.merge(options))
   end

data/app/mailers/effective/orders_mailer.rb

@@ -1,6 +1,8 @@
 module Effective
   class OrdersMailer < ActionMailer::Base
-    default from: -> { EffectiveOrders.mailer[:default_from] }
+    default from: -> { EffectiveOrders.mailer[:default_from].presence }
+    default cc: -> { EffectiveOrders.mailer[:default_cc].presence }
+    default bcc: -> { EffectiveOrders.mailer[:default_bcc].presence }
     layout -> { EffectiveOrders.mailer[:layout].presence || 'effective_orders_mailer_layout' }
 
     helper EffectiveOrdersHelper
@@ -27,7 +29,7 @@ module Effective
 
         @subject = subject_for(@order, :order_receipt_to_buyer, "Order Receipt: ##{@order.to_param}")
 
-        mail(to: @order.email, cc: @order.cc, subject: @subject)
+        mail({to: @order.email, cc: @order.cc, subject: @subject}.compact)
       end
     end
 
@@ -43,7 +45,7 @@ module Effective
 
         @subject = subject_for(@order, :payment_request_to_buyer, "Request for Payment: Invoice ##{@order.to_param}")
 
-        mail(to: @order.email, cc: @order.cc, subject: @subject)
+        mail({to: @order.email, cc: @order.cc, subject: @subject}.compact)
       end
     end
 
@@ -58,7 +60,7 @@ module Effective
 
         @subject = subject_for(@order, :pending_order_invoice_to_buyer, "Pending Order: ##{@order.to_param}")
 
-        mail(to: @order.email, cc: @order.cc, subject: @subject)
+        mail({to: @order.email, cc: @order.cc, subject: @subject}.compact)
       end
     end
 

data/app/models/concerns/acts_as_purchasable.rb

@@ -42,6 +42,8 @@ module ActsAsPurchasable
   end
 
   module ClassMethods
+    def acts_as_purchasable?; true; end
+
     def before_purchase(&block)
       send :define_method, :before_purchase do |order, order_item| self.instance_exec(order, order_item, &block) end
     end

data/app/models/concerns/acts_as_subscribable.rb

@@ -40,6 +40,7 @@ module ActsAsSubscribable
   end
 
   module ClassMethods
+    def acts_as_subscribable?; true; end
   end
 
   def subscripter

data/app/models/concerns/acts_as_subscribable_buyer.rb

@@ -19,6 +19,8 @@ module ActsAsSubscribableBuyer
   end
 
   module ClassMethods
+    def acts_as_subscribable_buyer?; true; end
+
     def after_invoice_payment_succeeded(&block)
       send :define_method, :after_invoice_payment_succeeded do |event| self.instance_exec(event, &block) end
     end
@@ -46,4 +48,3 @@ module ActsAsSubscribableBuyer
   end
 
 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
 
@@ -141,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) }
@@ -254,21 +250,52 @@ module Effective
     end
 
     def to_s
+      [label, ' #', to_param].join
+    end
+
+    def label
       if refund?
-        "Refund ##{to_param}"
+        "Refund"
       elsif purchased?
-        "Receipt ##{to_param}"
+        "Receipt"
       elsif pending?
-        "Pending Order ##{to_param}"
+        "Pending Order"
       else
-        "Order ##{to_param}"
+        "Order"
       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
+    # Visa - 1234
+    def payment_method
+      return nil unless purchased?
+
+      # Normalize payment card
+      card = case payment_card.to_s.downcase.gsub(' ', '').strip
+        when '' then nil
+        when 'v', 'visa' then 'Visa'
+        when 'm', 'mc', 'master', 'mastercard' then 'MasterCard'
+        when 'a', 'ax', 'american', 'americanexpress' then 'American Express'
+        when 'd', 'discover' then 'Discover'
+        else payment_card.to_s
+      end unless payment_provider == 'free'
+
+      # stripe, moneris, moneris_checkout
+      last4 = (payment[:active_card] || payment['f4l4'] || payment['first6last4']).to_s.last(4)
+
+      [card, '-', last4].compact.join(' ')
+    end
+
+    # For moneris and moneris_checkout. Just a unique value.
+    def transaction_id
+      [to_param, billing_name.to_s.parameterize.presence, Time.zone.now.to_i].compact.join('-')
+    end
+
+    def billing_first_name
+      billing_name.to_s.split(' ').first
+    end
+
+    def billing_last_name
+      Array(billing_name.to_s.split(' ')[1..-1]).join(' ')
     end
 
     def pending?
@@ -372,38 +399,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
@@ -466,6 +486,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/_checkout_step2.html.haml

@@ -20,6 +20,9 @@
     - if EffectiveOrders.moneris?
       = render partial: '/effective/orders/moneris/form', locals: provider_locals
 
+    - if EffectiveOrders.moneris_checkout?
+      = render partial: '/effective/orders/moneris_checkout/form', locals: provider_locals
+
     - if EffectiveOrders.paypal?
       = render partial: '/effective/orders/paypal/form', locals: provider_locals
 

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

@@ -3,9 +3,9 @@
     = render partial: 'effective/orders/order_actions', locals: { order: order }
 
   = render partial: 'effective/orders/order_header', locals: { order: order }
+  = render partial: 'effective/orders/order_payment', locals: { order: order }
   = render partial: 'effective/orders/order_shipping', locals: { order: order }
   = render partial: 'effective/orders/order_deferred', locals: { order: order }
   = render partial: 'effective/orders/order_notes', locals: { order: order }
   = render partial: 'effective/orders/order_items', locals: { order: order }
-  = render partial: 'effective/orders/order_payment', locals: { order: order }
   = render partial: 'effective/orders/order_footer', locals: { order: order }

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/_order_footer.html.haml

@@ -1 +1,3 @@
-- # intentionally left blank
+.effective-orders-footer
+  .mb-4.text-center
+    %p If you have any questions, please contact us or call right away.

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

@@ -1,23 +1,7 @@
 .effective-order-header
-  %h2 Acme Industries Inc.
-  .row
-    .col-sm-6
-      - email_address = EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'
-      %p= mail_to u(email_address), email_address
-      %p
-        1234 Fake Street
-        %br
-        Edmonton, AB, T5H 4A5
-        %br
-        %small Customize me by overriding '/app/views/effective/orders/_order_header.html.haml'
+  .mb-4.text-center
+    = image_tag('effective_orders/logo.png')
 
-    .col-sm-6
-      - if order.purchased?
-        %p Receipt: ##{order.to_param}
-      - elsif order.persisted?
-        %p Order: ##{order.to_param}
+    %h2 #{order.label} from Example Inc.
 
-      - if order.purchased?
-        %p Purchased at: #{order.purchased_at.strftime("%F %H:%M")}
-      - else
-        %p Date: #{Time.zone.now.strftime("%F %H:%M")}
+    %p.text-muted= order.to_s

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

@@ -1,24 +1,13 @@
 - if order.purchased?
-  .effective-order-payment-details
+  .effective-order-payment
     %table.table
       %thead
         %tr
-          %th Payment
-          %th
+          %th Amount Paid
+          %th Date Paid
+          %th Payment Method
       %tbody
         %tr
-          %td Provider
-          %td= order.payment_provider
-
-        - if order.payment_card.present?
-          %tr
-            %td Card
-            %td
-              = payment_card_label(order.payment_card)
-              - if order.payment.kind_of?(Hash)
-                = order.payment[:active_card] || order.payment['f4l4']
-
-        %tr
-          %td Purchased at
-          %td= order.purchased_at&.strftime('%F %H:%M')
-
+          %td= price_to_currency(order.total)
+          %td= order.purchased_at.strftime('%b %d, %Y')
+          %td= order.payment_method