effective_orders 5.0.1 → 5.1.0

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,6 +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)
+
+  %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.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/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.1'.freeze
+  VERSION = '5.1.0'.freeze
 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.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2021-05-20 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