effective_orders 5.0.3 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55f4ecfb00c2ff8fca1e88711877ca4c4a2c5e2772857645b1793eb42d672f6d
-  data.tar.gz: 97d1e59387d065240d3b0c160f725831d808ea153d6aedce2104f277c769e005
+  metadata.gz: 78aa25d8f77169e21e2f05886c47479ac2f64d8de4657510b2723ab9d4246fbd
+  data.tar.gz: 22f9fd8d7747c3975952fe6edfc6e221fe567ec0b287e619ba3afd861dcc2bfb
 SHA512:
-  metadata.gz: 74166e809d54fd9b2b0f4c266e59da9b0f8ff0947ac2166f6e88686fcaecf05a1c6e520933a935568717beae55a1db032aca72902641fbd031ecf60fe0302527
-  data.tar.gz: 464f54b750a6feab8ec0ad9df11c1b8591aa70d33a58faaf0cb03eb03d584ea4362fc9247f3ad3425e3269585cb78a18529cfc28c1ae41eadc0a28d2304f1298
+  metadata.gz: 7c3d9e1dcc47b3f982be6bc41abbafde4ceae73b682704f0916b941aa06248d431b52420d472592e850919e518bc12b835be04fdee5292d9d72396ebe9b053fe
+  data.tar.gz: 7ff135bb56772c9fdf3edf6d59dc4ef7e0dfade542b1db022b09db49fc2b9b7e9f7333ae5e705390b4b0f27a03127fb743c9ffb471b29dd74e4a6a3da75917d0

data/README.md

@@ -594,8 +594,74 @@ You will need an external IP address to work with these sandboxes.
 
 We suggest the free application `https://ngrok.com/` for this ability.
 
+## Paying with Moneris Checkout
 
-## Paying via Moneris
+Use the following instructions to set up a Moneris Checkout store.
+
+This is the javascript / pay in place form implementation.
+
+We do not use or implement tokenization of credentials with Moneris Checkout.
+
+We are also going to use ngrok to give us a public facing URL
+
+### Create Test / Development Store
+
+Visit https://esqa.moneris.com/mpg/ and login with: demouser / store1 / password
+
+- Select Admin -> Moneris Checkout Config from the menu
+- Click Create Profile
+
+Checkout Type: I have my custom order form and want to use Moneris simply for payment processing
+
+Multi-Currency: None
+
+Payment:
+
+- Google Pay: No
+- Card Logos: Yes
+- Payment Security: CVV
+- Transaction Type: Purchase
+- Transaction Limits: None
+
+Branding & Design
+
+- Logo Url: None
+- Colors: Default
+
+Customizations
+
+- Enable Fullscreen: No false (important)
+- Card Borders/Shadows: Yes
+
+Order Confirmation
+
+- Order Confirmation Processing: Use Moneris
+- Confirmation Page Content: Check all
+
+Email Communications
+
+- None
+- Customer Emails: None
+
+
+Now copy the Checkout id, something like `chktJF76Btore1` into the config/initializers/effective_orders.rb file.
+
+For the store_id and api_token values, you can use
+
+```
+config.moneris_checkout = {
+  environment: 'qa',
+  store_id: 'store1',
+  api_token: 'yesguy1',
+  checkout_id: '',  # You need to generate this one
+}
+```
+
+[Testing a Solution](https://developer.moneris.com/en/More/Testing/Testing%20a%20Solution)
+
+
+
+## Paying via Moneris (hosted pay page - old)
 
 Use the following instructions to set up a Moneris TEST store.
 

data/app/assets/config/effective_orders_manifest.js

@@ -0,0 +1,3 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link_directory ../images/effective_orders

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

@@ -0,0 +1,71 @@
+this.MonerisCheckoutForm ||= class MonerisCheckoutForm
+  constructor: ->
+    @form = null
+    @data = null
+    @moneris = null
+
+  initialize: ->
+    @form = $('form[data-moneris-checkout-form]:not(.initialized)').first()
+    return false unless @form.length > 0
+
+    @data = @form.data('moneris-checkout-form')
+    @moneris = new monerisCheckout()
+
+    @mount()
+    @form.addClass('initialized')
+
+  mount: ->
+    @moneris.setCheckoutDiv('monerisCheckout')
+
+    @moneris.setCallback('page_loaded', @pageLoaded)
+    @moneris.setCallback('cancel_transaction', @cancelTransaction)
+    @moneris.setCallback('error_event', @errorEvent)
+    @moneris.setCallback('payment_receipt', @paymentReceipt)
+    @moneris.setCallback('payment_complete', @paymentComplete)
+
+    @moneris.setMode(@data.environment)
+    @moneris.startCheckout(@data.ticket)
+
+  success: (payload) ->
+    @moneris.closeCheckout()
+
+    payment = JSON.parse(payload)
+    @form.find('#moneris-checkout-success').html("Transaction complete! Please wait a moment...")
+    @form.find("input[name$='[ticket]']").first().val(payment['ticket'])
+    @form.submit()
+
+  error: (text) ->
+    @moneris.closeCheckout()
+
+    text = "<p>" + text + "<p>Please <a href='#', onclick='window.location.reload();' class='alert-link'>reload the page</a> and try again.</p>"
+    @form.find('#moneris-checkout-error').addClass('alert').html(text)
+    EffectiveForm.invalidate(@form)
+
+  # Moneris iframe has loaded
+  pageLoaded: (payload) =>
+    preload = JSON.parse(payload)
+
+    switch preload['response_code']
+      when '001'
+        true # Success. Nothing to do.
+      when '902'
+        @error('3-D secure failed on response')
+      when '2001'
+        @error('Invalid ticket/ticket re-use')
+      else
+        @error('Unknown payment gateway preload status')
+
+  # Cancel Button
+  cancelTransaction: (payload) => false
+
+  # Any kind of error
+  errorEvent: (payload) =>
+    error = JSON.parse(payload)
+    @error("A payment gateway error #{error['response_code']} has occurred. Your card has not been charged.")
+
+  # Payment is all done
+  paymentReceipt: (payload) => @success(payload)
+  paymentComplete: (payload) => @success(payload)
+
+$ -> (new MonerisCheckoutForm()).initialize()
+$(document).on 'turbolinks:load', -> (new MonerisCheckoutForm()).initialize()

data/app/assets/javascripts/effective_orders.js

@@ -2,5 +2,5 @@
 
 //= require ./effective_orders/customers
 //= require ./effective_orders/subscriptions
-//= require_tree ./effective_orders/providers
 
+//= require_tree ./effective_orders/providers

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

@@ -45,6 +45,10 @@ form.new_effective_order {
   a.remove_fields.dynamic { float: right; }
 }
 
+.effective-moneris-checkout {
+  height: 640px;
+}
+
 @media print {
   .effective-orders-page-content { display: none; }
 

data/app/controllers/effective/concerns/purchase.rb

@@ -18,7 +18,7 @@ module Effective
           end
         end
 
-        purchased_url ||= effective_orders.purchased_order_path(':id')
+        purchased_url = effective_orders.purchased_order_path(':id') if purchased_url.blank?
         redirect_to purchased_url.gsub(':id', @order.to_param.to_s)
       end
 
@@ -35,7 +35,7 @@ module Effective
           end
         end
 
-        deferred_url ||= effective_orders.deferred_order_path(':id')
+        deferred_url = effective_orders.deferred_order_path(':id') if deferred_url.blank?
         redirect_to deferred_url.gsub(':id', @order.to_param.to_s)
       end
 
@@ -46,7 +46,7 @@ module Effective
           flash[:danger] = 'Payment was unsuccessful. Your credit card was declined by the payment processor. Please try again.'
         end
 
-        declined_url ||= effective_orders.declined_order_path(':id')
+        declined_url = effective_orders.declined_order_path(':id') if declined_url.blank?
         redirect_to declined_url.gsub(':id', @order.to_param.to_s)
       end
 

data/app/controllers/effective/orders_controller.rb

@@ -7,6 +7,7 @@ module Effective
     include Providers::Free
     include Providers::MarkAsPaid
     include Providers::Moneris
+    include Providers::MonerisCheckout
     include Providers::Paypal
     include Providers::Phone
     include Providers::Pretend

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

@@ -0,0 +1,59 @@
+module Effective
+  module Providers
+    module MonerisCheckout
+      extend ActiveSupport::Concern
+
+      def moneris_checkout
+        raise('moneris_checkout provider is not available') unless EffectiveOrders.moneris_checkout?
+
+        @order = Order.find(params[:id])
+        (EffectiveResources.authorize!(self, :update, @order) rescue false)
+
+        payment = moneris_checkout_receipt_request(moneris_checkout_params[:ticket])
+        purchased = (1..49).include?(payment['response_code'].to_i) # Must be > 0 and < 50 to be valid. Sometimes we get the string 'null'
+
+        if purchased == false
+          return order_declined(
+            payment: payment,
+            provider: 'moneris_checkout',
+            declined_url: moneris_checkout_params[:declined_url]
+          )
+        end
+
+        order_purchased(
+          payment: payment,
+          provider: 'moneris_checkout',
+          card: payment['card_type'],
+          purchased_url: moneris_checkout_params[:purchased_url]
+        )
+      end
+
+      private
+
+      def moneris_checkout_params
+        params.require(:moneris_checkout).permit(:ticket, :purchased_url, :declined_url)
+      end
+
+      def moneris_checkout_receipt_request(ticket)
+        params = {
+          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: :receipt,
+          ticket: ticket
+        }
+
+        response = Effective::Http.post(EffectiveOrders.moneris_request_url, params: params)
+        response = response['response'] if response
+
+        raise("moneris receipt error #{response}") unless response && response['success'].to_s == 'true'
+
+        response.dig('receipt', 'cc') || response.dig('receipt', 'gift') || response
+      end
+
+    end
+  end
+end

data/app/datatables/admin/effective_orders_datatable.rb

@@ -14,12 +14,12 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   filters do
-    if attributes[:user_id].blank? && attributes[:parent_id].blank?
-      scope :purchased, default: true
+    unless attributes[:skip_filters]
+      scope :all
+      scope :purchased
       scope :deferred
       scope :refunds
       scope :not_purchased
-      scope :all
     end
   end
 
@@ -84,13 +84,14 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.includes(:addresses, :order_items, :user)
+    scope = Effective::Order.all.deep
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
     end
 
     if attributes[:user_id].present?
+      user = current_user.class.find(attributes[:user_id])
       scope = scope.where(user: user)
     end
 
@@ -101,8 +102,4 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= current_user.class.find(attributes[:user_id])
-  end
-
 end

data/app/datatables/effective_orders_datatable.rb

@@ -59,7 +59,9 @@ class EffectiveOrdersDatatable < Effective::Datatable
   end
 
   collection do
-    scope = Effective::Order.all.where(user: user).includes(:addresses, :order_items, :user)
+    user = current_user.class.find(attributes[:user_id])
+
+    scope = Effective::Order.all.deep.where(user: user)
 
     if EffectiveOrders.orders_collection_scope.respond_to?(:call)
       scope = EffectiveOrders.orders_collection_scope.call(scope)
@@ -76,8 +78,4 @@ class EffectiveOrdersDatatable < Effective::Datatable
     scope
   end
 
-  def user
-    @user ||= view.current_user.class.find(attributes[:user_id])
-  end
-
 end

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
@@ -111,25 +113,6 @@ module EffectiveOrdersHelper
     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

@@ -118,12 +118,6 @@ module Effective
       end
     end
 
-    with_options if: -> { confirmed? && !skip_buyer_validations? } do
-      if EffectiveOrders.terms_and_conditions
-        validates :terms_and_conditions, presence: true
-      end
-    end
-
     # When Purchased
     with_options if: -> { purchased? } do
       validates :purchased_at, presence: true
@@ -137,7 +131,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) }
@@ -250,17 +244,54 @@ 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
 
+    # 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?
       state == EffectiveOrders::PENDING
     end

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_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

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

@@ -1,12 +1,10 @@
 %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  = link_to 'Home', root_path
-
 %p.effective-orders-page-content
   - if current_cart.present?
     Your #{link_to_current_cart(label: 'Cart')} items have been saved. Please try again.
   - else
     Please try again.
 
-= link_to 'Continue', root_path, class: 'btn btn-primary'
+%p.text-center
+  = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -1,8 +1,5 @@
 %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  = link_to 'Home', root_path
-
 %p.effective-orders-page-content
   You have indicated that this order will be paid by #{@order.payment_provider}.
   Your order will not be considered purchased until we receive your payment.
@@ -10,4 +7,5 @@
 
 = render @order
 
-= link_to 'Continue', root_path, class: 'btn btn-primary'
+%p.text-center
+  = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -0,0 +1,4 @@
+.effective-moneris-checkout
+  #moneris-checkout-error.text-center.alert-danger
+  #moneris-checkout-success.text-center
+  #monerisCheckout

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

@@ -0,0 +1,23 @@
+= javascript_include_tag(EffectiveOrders.moneris_checkout_script_url)
+
+- moneris_checkout = moneris_checkout_preload_request(order)
+
+.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
+
+      -# This is set by the moneris_checkout.js javascript
+      = f.hidden_field :ticket
+
+      = render('effective/orders/moneris_checkout/element')
+
+    .mt-3.text-center
+      %em
+        This checkout provided by
+        = succeed('.') do
+          = link_to('Moneris', 'https://www.moneris.com', target: '_blank', class: 'btn-link')

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

@@ -1,11 +1,9 @@
 %h1.effective-heading= @page_title
 
-%p.effective-orders-page-content
-  = link_to 'Home', root_path
-
 %p.effective-orders-page-content
   You have successfully purchased the following:
 
 = render @order
 
-= link_to 'Continue', root_path, class: 'btn btn-primary'
+%p.text-center
+  = link_to 'Continue', root_path, class: 'btn btn-primary'

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

@@ -1,10 +1,9 @@
 %h1.effective-heading= @page_title
 
-- if @order.user == current_user
+- if !@order.purchased? && @order.user == current_user
   = render_checkout(@order)
 - else
-  = render @order
+  = render(@order)
 
-%hr
-
-= link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'
+  %p.text-center
+    = link_to 'Continue', effective_orders.orders_path, class: 'btn btn-primary'

data/config/effective_orders.rb

@@ -166,6 +166,25 @@ EffectiveOrders.setup do |config|
   #   }
   # end
 
+  # Moneris Checkout
+  config.moneris_checkout = false
+
+  # if Rails.env.production?
+  #   config.moneris_checkout = {
+  #     environment: 'prod',
+  #     store_id: '',
+  #     api_token: '',
+  #     checkout_id: '',
+  #   }
+  # else
+  #   config.moneris_checkout = {
+  #     environment: 'qa',
+  #     store_id: 'store1',
+  #     api_token: 'yesguy1',
+  #     checkout_id: 'chktJF76Btore1',
+  #   }
+  # end
+
   # Paypal
   config.paypal = false
 

data/config/routes.rb

@@ -10,6 +10,7 @@ EffectiveOrders::Engine.routes.draw do
         post :free
         post :mark_as_paid
         post :cheque
+        post :moneris_checkout
         post :phone
         post :pretend
         post :refund

data/lib/effective_orders/engine.rb

@@ -16,8 +16,8 @@ module EffectiveOrders
       eval File.read("#{config.root}/config/effective_orders.rb")
     end
 
-    initializer "effective_orders.append_precompiled_assets" do |app|
-      Rails.application.config.assets.precompile += ['effective_orders/*']
+    initializer 'effective_orders.assets' do |app|
+      app.config.assets.precompile += ['effective_orders_manifest.js', 'effective_orders/*']
     end
 
     initializer 'effective_orders.refund', after: :load_config_initializers do

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.1.1'.freeze
 end

data/lib/effective_orders.rb

@@ -34,7 +34,7 @@ module EffectiveOrders
       # Features
       :free_enabled, :mark_as_paid_enabled, :pretend_enabled, :pretend_message,
       # Payment processors. false or Hash
-      :cheque, :moneris, :paypal, :phone, :refund, :stripe, :subscriptions, :trial
+      :cheque, :moneris, :moneris_checkout, :paypal, :phone, :refund, :stripe, :subscriptions, :trial
     ]
   end
 
@@ -69,6 +69,10 @@ module EffectiveOrders
     moneris.kind_of?(Hash)
   end
 
+  def self.moneris_checkout?
+    moneris_checkout.kind_of?(Hash)
+  end
+
   def self.paypal?
     paypal.kind_of?(Hash)
   end
@@ -98,7 +102,7 @@ module EffectiveOrders
   end
 
   def self.single_payment_processor?
-    [moneris?, paypal?, stripe?].select { |enabled| enabled }.length == 1
+    [moneris?, moneris_checkout?, paypal?, stripe?].select { |enabled| enabled }.length == 1
   end
 
   # The Effective::Order.payment_provider value must be in this collection
@@ -108,6 +112,7 @@ module EffectiveOrders
       ('credit card' if mark_as_paid?),
       ('free' if free?),
       ('moneris' if moneris?),
+      ('moneris_checkout' if moneris_checkout?),
       ('paypal' if paypal?),
       ('phone' if phone?),
       ('pretend' if pretend?),
@@ -197,6 +202,22 @@ module EffectiveOrders
     stripe_plans.map { |plan| [plan[:name], plan[:id]] }
   end
 
+  def self.moneris_checkout_script_url
+    case EffectiveOrders.moneris_checkout.fetch(:environment)
+    when 'prod' then 'https://gateway.moneris.com/chkt/js/chkt_v1.00.js'
+    when 'qa' then 'https://gatewayt.moneris.com/chkt/js/chkt_v1.00.js'
+    else raise('unexpected EffectiveOrders.moneris_checkout :environment key. Please check your config/initializers/effective_orders.rb file')
+    end
+  end
+
+  def self.moneris_request_url
+    case EffectiveOrders.moneris_checkout.fetch(:environment)
+    when 'prod' then 'https://gateway.moneris.com/chkt/request/request.php'
+    when 'qa' then 'https://gatewayt.moneris.com/chkt/request/request.php'
+    else raise('unexpected EffectiveOrders.moneris_checkout :environment key. Please check your config/initializers/effective_orders.rb file')
+    end
+  end
+
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
 end

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -61,6 +61,12 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
     order = Effective::Order.new(id: 1)
     order.user = preview_user
     preview_order_items.each { |atts| order.order_items.build(atts) }
+
+    order.state = 'purchased'
+    order.payment_card = 'visa'
+    order.purchased_at = Time.zone.now
+    order.payment = { 'f4l4' => '1234'}
+
     order.valid?
     order
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: sassc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: effective_addresses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.
 email:
@@ -118,9 +174,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/assets/config/effective_orders_manifest.js
+- app/assets/images/effective_orders/logo.png
 - app/assets/images/effective_orders/stripe.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee
+- app/assets/javascripts/effective_orders/providers/moneris_checkout.js.coffee
 - app/assets/javascripts/effective_orders/providers/stripe.js.coffee
 - app/assets/javascripts/effective_orders/subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
@@ -137,6 +196,7 @@ files:
 - app/controllers/effective/providers/free.rb
 - app/controllers/effective/providers/mark_as_paid.rb
 - app/controllers/effective/providers/moneris.rb
+- app/controllers/effective/providers/moneris_checkout.rb
 - app/controllers/effective/providers/paypal.rb
 - app/controllers/effective/providers/phone.rb
 - app/controllers/effective/providers/pretend.rb
@@ -148,6 +208,7 @@ files:
 - app/datatables/admin/effective_orders_datatable.rb
 - app/datatables/effective_orders_datatable.rb
 - app/helpers/effective_carts_helper.rb
+- app/helpers/effective_moneris_checkout_helper.rb
 - app/helpers/effective_orders_helper.rb
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
@@ -213,6 +274,8 @@ files:
 - app/views/effective/orders/index.html.haml
 - app/views/effective/orders/mark_as_paid/_form.html.haml
 - app/views/effective/orders/moneris/_form.html.haml
+- app/views/effective/orders/moneris_checkout/_element.html.haml
+- app/views/effective/orders/moneris_checkout/_form.html.haml
 - app/views/effective/orders/new.html.haml
 - app/views/effective/orders/paypal/_form.html.haml
 - app/views/effective/orders/phone/_form.html.haml