effective_orders 4.0.0beta2 → 4.0.0beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da1a756900ec2369535464ac59524e04e480c05f
-  data.tar.gz: 593c2b74776dd66558b67efc5ddc2fb09b94203b
+  metadata.gz: 41a725b2c451424ab930ca84057bfa76d9404a14
+  data.tar.gz: 90b4af7a1be8ad14966a6449b14620271677bb1f
 SHA512:
-  metadata.gz: d3d7d27ebe782735240eba20c79372d281c9ffa009305c853e2bdd6ed319cf19936051ce8e82b9859f3ee4f6265e67db02161c984b51e42f229b3d4fb2e2474e
-  data.tar.gz: a8ff40a48e296934603d9841df3a4854d36fe4ce4ffa59d896310a6176aae905b29aab7ca7b4e1ca2d35bdbd75846b3eeea2c6f2b96e6737410c57d80b42f89c
+  metadata.gz: ca7e090b0167792643e3a9d56d4c25d1127e30a7fa84a33df06c96c762a832633aefed1fca2074b37cc28511a1159ad4880f5a09b1501e1e76884c0028269ad7
+  data.tar.gz: a0cd6b57b48f61aef840cdff2339bac7ec5ff9bf5cf0846121535ffb88e719d30a0f4436eed781e7ca44ab2deeb298b7e5c0df3d8a850a6b6ee9d1e6dbecdc10

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

@@ -35,15 +35,6 @@
   margin-bottom: 1rem;
 }
 
-// Checkout buttons. Bottom of order.
-.effective-order-purchase-actions {
-  text-align: right;
-
-  > * {
-    display: inline-block;
-  }
-}
-
 .effective-order-admin-purchase-actions {
   margin-top: 0.5rem;
 }

data/app/controllers/admin/orders_controller.rb

@@ -105,6 +105,8 @@ module Admin
 
       authorize_effective_order!
 
+      @page_title ||= 'Checkout'
+
       if request.get?
         @order.assign_confirmed_if_valid!
         render :checkout and return

data/app/helpers/effective_orders_helper.rb

@@ -37,21 +37,21 @@ module EffectiveOrdersHelper
 
     case processor
     when :cheque
-      'Pay by cheque'
+      'Pay by Cheque'
     when :free
-      'Checkout free'
+      'Checkout Free'
     when :mark_as_paid
-      'Mark as paid'
+      'Admin: Mark as Paid'
     when :moneris
-      'Checkout with credit card'
+      'Checkout with Credit Card'
     when :paypal
       'Checkout with PayPal'
     when :pretend
       EffectiveOrders.pretend_purchase_in_production_enabled ? 'Purchase Order' : 'Purchase Order (development only)'
     when :refund
-      'Complete refund'
+      'Complete Refund'
     when :stripe
-      'Checkout with credit card'
+      'Checkout with Credit Card'
     else
       'Checkout'
     end

data/app/models/concerns/acts_as_purchasable.rb

@@ -6,11 +6,16 @@ module ActsAsPurchasable
   module ActiveRecord
     def acts_as_purchasable(*options)
       @acts_as_purchasable = options || []
-      include ::ActsAsPurchasable
 
       instance = new()
       raise 'must respond_to price' unless instance.respond_to?(:price)
       raise 'must respond_to purchased_order_id' unless instance.respond_to?(:purchased_order_id)
+
+      if defined?(EffectiveQbSync)
+        raise 'must respond to qb_item_name' unless instance.respond_to?(:qb_item_name)
+      end
+
+      include ::ActsAsPurchasable
     end
   end
 

data/app/views/admin/customers/_actions.html.haml

@@ -1 +1,2 @@
-= link_to 'Manage', "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers/#{customer.stripe_customer_id}"
+= dropdown(variation: :dropleft) do
+  = dropdown_link_to 'Manage',  "https://dashboard.stripe.com/#{'test/' if Rails.env.development?}customers/#{customer.stripe_customer_id}"

data/app/views/admin/orders/_order_actions.html.haml

@@ -1,6 +1,7 @@
-= effective_save(form) do
+= form.submit do
   = form.save 'Save', class: 'btn btn-primary'
   = form.save 'Duplicate', class: 'btn btn-primary'
+
   - unless form.object.purchased?
     = form.save 'Checkout', class: 'btn btn-success'
 

data/app/views/admin/orders/_order_item_fields.html.haml

@@ -2,8 +2,12 @@
   .row.align-items-center
     = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
       .col-md-1= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
-      .col-md-5= pf.text_field :title, maxlength: 255
+      .col-md-4= pf.text_field :title, maxlength: 255
       .col-md-2= pf.price_field :price
+
+      - if defined?(EffectiveQbSync)
+        .col-md-2= pf.text_field :qb_item_name, maxlength: 255, label: 'Quickbooks Item'
+
       .col-md-2.mt-4= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'
       .col-md-1.mt-4
         = link_to_remove_association(f, 'data-confirm': 'Really remove this item?') do

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

@@ -31,4 +31,4 @@
     - if EffectiveOrders.terms_and_conditions
       = render partial: 'effective/orders/order_terms_and_conditions_fields', locals: { form: f }
 
-    = effective_save(f, 'Proceed to Checkout')
+    = f.submit 'Proceed to Checkout'

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

@@ -4,40 +4,42 @@
   .effective-order-change-items
     = link_to 'Change Addresses', effective_orders.edit_order_path(order), rel: :nofollow, class: 'btn btn-secondary'
 
-.effective-order.effective-order-purchase-actions.form-actions
-  - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url }
+.effective-order-purchase-actions
+  .form-actions.form-actions-bordered.justify-content-end
+    - provider_locals = { order: order, purchased_url: purchased_url, declined_url: declined_url }
 
-  - if EffectiveOrders.free? && order.free?
-    = render partial: '/effective/orders/free/form', locals: provider_locals
+    - if EffectiveOrders.free? && order.free?
+      = render partial: '/effective/orders/free/form', locals: provider_locals
 
-  - elsif EffectiveOrders.refunds? && order.refund?
-    -# Nothing
+    - elsif EffectiveOrders.refunds? && order.refund?
+      -# Nothing
 
-  - else
-    - if EffectiveOrders.pretend?
-      = render partial: '/effective/orders/pretend/form', locals: provider_locals
+    - else
+      - if EffectiveOrders.pretend?
+        = render partial: '/effective/orders/pretend/form', locals: provider_locals
 
-    - if EffectiveOrders.moneris?
-      = render partial: '/effective/orders/moneris/form', locals: provider_locals
+      - if EffectiveOrders.moneris?
+        = render partial: '/effective/orders/moneris/form', locals: provider_locals
 
-    - if EffectiveOrders.paypal?
-      = render partial: '/effective/orders/paypal/form', locals: provider_locals
+      - if EffectiveOrders.paypal?
+        = render partial: '/effective/orders/paypal/form', locals: provider_locals
 
-    - if EffectiveOrders.stripe?
-      = render partial: '/effective/orders/stripe/form', locals: provider_locals
+      - if EffectiveOrders.stripe?
+        = render partial: '/effective/orders/stripe/form', locals: provider_locals
 
-    - if EffectiveOrders.cheque? && order.user == current_user
-      = render partial: '/effective/orders/cheque/form', locals: provider_locals
+      - if EffectiveOrders.cheque? && order.user == current_user
+        = render partial: '/effective/orders/cheque/form', locals: provider_locals
 
-  - if EffectiveOrders.pretend? && Rails.env.production? && EffectiveOrders.pretend_purchase_in_production_message.present?
-    %br
-    %p= EffectiveOrders.pretend_purchase_in_production_message
+    - if EffectiveOrders.pretend? && Rails.env.production? && EffectiveOrders.pretend_purchase_in_production_message.present?
+      %br
+      %p= EffectiveOrders.pretend_purchase_in_production_message
 
-- if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
-  - if EffectiveOrders.refunds? && order.refund?
-    .effective-order.effective-order-admin-purchase-actions
-      = render partial: '/effective/orders/refund/form', locals: provider_locals
-  - elsif EffectiveOrders.mark_as_paid?
-    .effective-order.effective-order-admin-purchase-actions
-      = render partial: '/effective/orders/mark_as_paid/form', locals: provider_locals
+
+  - if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
+    - if EffectiveOrders.refunds? && order.refund?
+      .effective-order-admin-purchase-actions
+        = render partial: '/effective/orders/refund/form', locals: provider_locals
+    - elsif EffectiveOrders.mark_as_paid?
+      .effective-order-admin-purchase-actions
+        = render partial: '/effective/orders/mark_as_paid/form', locals: provider_locals
 

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

@@ -1,4 +1,5 @@
-= form_tag(effective_orders.pay_by_cheque_order_path(order), method: :post) do
+= effective_form_with(scope: :cheque, url: effective_orders.pay_by_cheque_order_path(order), method: :post) do |f|
   = hidden_field_tag(:purchased_url, purchased_url)
   = hidden_field_tag(:declined_url, declined_url)
-  = submit_tag order_checkout_label(:cheque), class: 'btn btn-primary', data: { confirm: EffectiveOrders.cheque[:confirm].presence, disable_with: 'Continuing...' }
+
+  = f.submit order_checkout_label(:cheque), border: false

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

@@ -3,10 +3,12 @@
 %p= flash[:danger]
 
 %p.effective-orders-page-content
-  = link_to 'Home', root_path, class: 'btn btn-primary'
+  = 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'

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

@@ -1,4 +1,5 @@
-= form_tag(effective_orders.free_order_path(order), method: :post) do
+= effective_form_with(scope: :free, url: effective_orders.free_order_path(order), method: :post) do |f|
   = hidden_field_tag(:purchased_url, purchased_url)
   = hidden_field_tag(:declined_url, declined_url)
-  = submit_tag order_checkout_label(:free), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+
+  = f.submit order_checkout_label(:free), border: false

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

@@ -1,5 +1,5 @@
-.panel.panel-default
-  .panel-body
+.card
+  .card-body
     %h2 Admin: Offline Payment
 
     = effective_form_with(model: order, url: effective_orders.mark_as_paid_order_path(order), method: :post) do |f|
@@ -22,5 +22,5 @@
 
       = f.text_area :note_to_buyer, hint: 'This message will be displayed on the receipt.'
 
-      = effective_save(f, 'Admin: Mark as Paid')
+      = f.submit order_checkout_label(:mark_as_paid)
 

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

@@ -1,4 +1,4 @@
-= form_tag(EffectiveOrders.moneris[:hpp_url], method: :post) do
+= effective_form_with(scope: :moneris, url: EffectiveOrders.moneris[:hpp_url], method: :post) do |f|
   = hidden_field_tag(:ps_store_id, EffectiveOrders.moneris[:ps_store_id])
   = hidden_field_tag(:hpp_key, EffectiveOrders.moneris[:hpp_key])
   = hidden_field_tag(:lang, 'en-ca')
@@ -44,4 +44,4 @@
     = hidden_field_tag(:ship_postal_code, address.postal_code)
     = hidden_field_tag(:ship_country, address.country)
 
-  = submit_tag order_checkout_label(:moneris), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+  = f.submit order_checkout_label(:moneris), border: false

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

@@ -1,5 +1,5 @@
-= form_tag(EffectiveOrders.paypal[:paypal_url], method: :post) do
-  = hidden_field_tag :cmd, '_s-xclick'
-  = hidden_field_tag :encrypted, paypal_encrypted_payload(order)
+= effective_form_with(scope: :paypal, url: EffectiveOrders.paypal[:paypal_url], method: :post) do |f|
+  = hidden_field_tag(:cmd, '_s-xclick')
+  = hidden_field_tag(:encrypted, paypal_encrypted_payload(order))
 
-  = submit_tag order_checkout_label(:paypal), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+  = f.submit order_checkout_label(:paypal), border: false

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

@@ -1,2 +1,2 @@
-= form_tag(effective_orders.pretend_order_path(order, purchased_url: purchased_url, declined_url: declined_url), method: :post) do
-  = submit_tag order_checkout_label(:pretend), class: 'btn btn-primary', data: { disable_with: 'Continuing...' }
+= effective_form_with(scope: :pretend, url: effective_orders.pretend_order_path(order, purchased_url: purchased_url, declined_url: declined_url), method: :post) do |f|
+  = f.submit order_checkout_label(:pretend), border: false

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

@@ -1,9 +1,11 @@
 %h1.effective-heading= @page_title
 
 %p.effective-orders-page-content
-  = link_to 'Home', root_path, class: 'btn btn-primary'
+  = 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'

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

@@ -1,5 +1,5 @@
-.panel.panel-default
-  .panel-body
+.card
+  .card-body
     %h2 Admin: Complete Refund
 
     = effective_form_with(model: order, url: effective_orders.refund_order_path(order), method: :post) do |f|
@@ -23,6 +23,4 @@
 
       = f.text_area :note_to_buyer, hint: 'This is displayed to the buyer on all order receipts.'
 
-      .text-right
-        = f.submit order_checkout_label(:refund), class: 'btn btn-primary'
-
+      = f.submit order_checkout_label(:refund)

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

@@ -4,4 +4,5 @@
   = effective_form_with(model: @stripe_charge || Effective::Providers::StripeCharge.new(order: order), url: effective_orders.stripe_charge_orders_path) do |f|
     = f.hidden_field :stripe_token
     = f.hidden_field :effective_order_id
-    = f.submit order_checkout_label(:stripe), class: 'btn btn-primary'
+
+    = f.submit order_checkout_label(:stripe), border: false

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

@@ -110,6 +110,8 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.integer   :price
       t.boolean   :tax_exempt, :default => false
 
+      t.string    :qb_item_name
+
       t.timestamps
     end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta2'.freeze
+  VERSION = '4.0.0beta3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta2
+  version: 4.0.0beta3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails