effective_orders 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 793c9df1822bf63be47d98586f545f026cd5ea7d
-  data.tar.gz: 072df510e3963f95b7e49cda4709e0f65c8a586c
+  metadata.gz: 0859d05abbb767645eea00e2032ffbc509fd27b7
+  data.tar.gz: c8394d5d17df7acd343431f3f57b49437cb59c2b
 SHA512:
-  metadata.gz: c264b1f08954da9f38b34b3c753d46a83b859876035d64263925614b79d1ccacb6fd88e05efdda6c26694d2994984e2f425d5c8c8a54cffc3526b15dac5943f2
-  data.tar.gz: 0835197276efa3182745d988acae1ae5eac7539a74c348a9507bb534b28079f24ea3da41d6de28f299ad0ad9c7054753bc52167de8142d52bc2054e9af64e5e7
+  metadata.gz: 4521494be70f5ae7d3cc306094a1a05bc1e50a1d92fc59aa50ea30603447ef7423ce32e6fa454824173874eba1714c86960fcab1c5f1d1b1b2c2ff71b3f848c3
+  data.tar.gz: 622e6827e569114d063340637f2029b423483a859073eacd46b1a3d750935a5b787f6fa3abea94dae592fe0dee7850cc97a660a6d3e00ce32647ab511881dfba

data/README.md

@@ -679,9 +679,9 @@ Transaction Type: Purchase
 
 Response Method: Sent to your server as a POST
 
-Approved URL: http://4f972556.ngrok.com/orders/moneris_postback
+Approved URL: https://myapp.herokuapp.com/orders/moneris_postback
 
-Declined URL: http://4f972556.ngrok.com/orders/moneris_postback
+Declined URL: https://myapp.herokuapp.com/orders/moneris_postback
 
 Note: The Approved and Declined URLs must match the effective_orders.moneris_postback_path value in your application. By default it is /orders/moneris_postback
 
@@ -731,7 +731,7 @@ Display merchange name: true, if you have an SSL cert
 
 Cancel Button Text:  'Cancel'
 
-Cancel Button URL: http://4f972556.ngrok.com
+Cancel Button URL: https://myapp.herokuapp.com/
 
 Click 'Save Appearance Settings'
 
@@ -752,16 +752,18 @@ Click 'Return to main configuration'
 
 ### Security
 
-Referring URL: Depends how you're using effective_orders in your application, you can add multiple URLs
-By default, use http://4f972556.ngrok.com/orders/new
+Referring URL: https://myapp.herokuapp.com/
 
 Enable Card Verification: false, unused
 
 Enable Transaction Verification: true
+
 Response Method: Displayed as key/value pairs on our server.
+
 Response URL: leave blank
 
 Click 'Save Verification Settings'
+
 Click 'Return to main configuration'
 
 
@@ -777,7 +779,9 @@ If you'd prefer to use the Moneris receipt, disable email sendouts from the conf
 With this test store set up, you can make a successful purchase with:
 
 Cardholder Name: Any name
+
 Credit Card Number: 4242 4242 4242 4242
+
 Expiry Date: Any future date
 
 Some gotchas:

data/app/controllers/admin/orders_controller.rb

@@ -11,6 +11,7 @@ module Admin
       authorize_effective_order!
     end
 
+    # We use the show action as an edit screen too
     def show
       @order = Effective::Order.find(params[:id])
       @page_title = "Order ##{@order.to_param}"
@@ -18,6 +19,26 @@ module Admin
       authorize_effective_order!
     end
 
+    def update
+      @order = Effective::Order.find(params[:id])
+      @page_title = "Order ##{@order.to_param}"
+
+      authorize_effective_order!
+
+      if @order.update_attributes(order_params)
+        if params[:commit].to_s.downcase == 'save internal note'
+          flash[:success] = 'Successfully updated internal note'
+        else
+          flash[:success] = 'Successfully updated order'
+        end
+
+        redirect_to effective_orders.admin_order_path(@order)
+      else
+        flash.now[:danger] = 'Unable to update order'
+        render action: :show
+      end
+    end
+
     def new
       @order = Effective::Order.new
       @page_title = 'New Order'
@@ -28,17 +49,16 @@ module Admin
     def create
       @user = User.find_by_id(order_params[:user_id])
       @order = Effective::Order.new(user: @user)
-      @order.send_payment_request_to_buyer = order_params[:send_payment_request_to_buyer]
 
       authorize_effective_order!
 
-      if order_params[:order_items_attributes].present?
-        order_params[:order_items_attributes].each do |_, item_attrs|
-          purchasable = Effective::Product.new(item_attrs[:purchasable_attributes])
-          @order.add(purchasable, quantity: item_attrs[:quantity])
-        end
+      (order_params[:order_items_attributes] || {}).each do |_, item_attrs|
+        purchasable = Effective::Product.new(item_attrs[:purchasable_attributes])
+        @order.add(purchasable, quantity: item_attrs[:quantity])
       end
 
+      @order.attributes = order_params.except(:order_items_attributes, :user_id)
+
       if @order.create_as_pending
         path_for_redirect = params[:commit] == 'Save and Add New' ? effective_orders.new_admin_order_path : effective_orders.admin_order_path(@order)
         message = 'Successfully created order'
@@ -54,22 +74,33 @@ module Admin
 
     def mark_as_paid
       @order = Effective::Order.find(params[:id])
+      @page_title = 'Mark as Paid'
+
       authorize_effective_order!
 
-      purchased = @order.purchase!(
-        details: 'Marked as paid by admin',
-        provider: 'admin',
-        card: 'none',
-        email: EffectiveOrders.mailer[:send_order_receipts_when_marked_paid_by_admin],
-        skip_buyer_validations: true  # This will allow a declined order to be marked purchased
-      )
+      if request.patch? || request.post?  # They are submitting the form to mark an order as paid
+        purchased = false
 
-      if purchased
-        flash[:success] = 'Order marked as paid successfully'
-        redirect_to effective_orders.admin_order_path(@order)
-      else
-        flash[:danger] = 'Unable to mark order as paid'
-        request.referrer ? (redirect_to :back) : (redirect_to effective_orders.admin_orders_path)
+        @order.attributes = order_params.except(:payment, :payment_provider, :payment_card)
+
+        begin
+          purchased = @order.purchase!(
+            details: order_params[:payment],
+            provider: order_params[:payment_provider],
+            card: order_params[:payment_card],
+            email: @order.send_mark_as_paid_email_to_buyer?,
+          )
+        rescue => e
+          purchased = false
+        end
+
+        if purchased
+          flash[:success] = 'Order marked as paid successfully'
+          redirect_to effective_orders.admin_order_path(@order)
+        else
+          flash.now[:danger] = "Unable to mark order as paid: #{@order.errors.full_messages.to_sentence}"
+          render action: :mark_as_paid
+        end
       end
     end
 
@@ -90,6 +121,8 @@ module Admin
 
     def order_params
       params.require(:effective_order).permit(:user_id, :send_payment_request_to_buyer,
+        :note_internal, :note_to_buyer,
+        :payment_provider, :payment_card, :payment, :send_mark_as_paid_email_to_buyer,
         order_items_attributes: [
           :quantity, :_destroy, purchasable_attributes: [
             :title, :price, :tax_exempt

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

@@ -53,44 +53,3 @@ module Effective
     end
   end
 end
-
-
-# Instructions to set up a Test Moneris Store
-
-# https://esqa.moneris.com/mpg/index.php
-
-# demouser
-# store2
-# password
-
-# Click on the ADMIN -> hosted config
-
-# Generate a Version3 Configuration
-
-# This should bring us to a "hosted Paypage Configuration"
-
-# == Basic Configuration ==
-# - Transaction Type: Purchase
-# - Response Method Sent to your server as a POST
-# - Approved URL:  http://ourwebsite.com/orders/moneris_postback
-# - Declined URL:  http://ourwebsite.com/orders/moneris_postback
-
-# == Appearance ==
-# - Display item details
-# - Display customer details
-# - Display billing address details
-# - Display merchant name
-# - Cancel Button Text: Cancel Transaction
-# - Cancel Button URL  http://ourwebsite.com
-
-# == Response Fields ==
-# - Ignore, leave blank, the asynchronous data post
-# - Do not Perform an asynchronous data post.  Leave Async Response URL blank
-
-# == Security ==
-# Add a URL http://ourwebsite.com/orders/new
-# Click YES Enable Transaction Verification
-# Sent to your server as a POST
-# Response URL:  http://ourwebsite.com/orders/moneris_postback
-
-# Displayed as key/value pairs on our server

data/app/models/effective/order.rb

@@ -13,6 +13,7 @@ module Effective
 
     attr_accessor :save_billing_address, :save_shipping_address, :shipping_address_same_as_billing # save these addresses to the user if selected
     attr_accessor :send_payment_request_to_buyer # Used by the /admin/orders/new form. Should the payment request email be sent after creating an order?
+    attr_accessor :send_mark_as_paid_email_to_buyer  # Used by the /admin/orders/mark_as_paid action
     attr_accessor :skip_buyer_validations # Enabled by the /admin/orders/create action
 
     belongs_to :user, validate: false  # This is the user who purchased the order. We validate it below.
@@ -282,6 +283,10 @@ module Effective
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.send_payment_request_to_buyer)
     end
 
+    def send_mark_as_paid_email_to_buyer?
+      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.send_mark_as_paid_email_to_buyer)
+    end
+
     def shipping_address_same_as_billing?
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
     end
@@ -322,6 +327,9 @@ module Effective
 
           success = true
         rescue => e
+          self.purchase_state = purchase_state_was
+          self.purchased_at = purchased_at_was
+
           raise ::ActiveRecord::Rollback
         end
       end

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

@@ -1,2 +1,6 @@
+- if (order.purchased? == false) && (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
+  = link_to effective_orders.mark_as_paid_admin_order_path(order), title: 'Mark as Paid' do
+    %span.glyphicon.glyphicon-usd
+
 = link_to (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)), title: 'View' do
   %span.glyphicon.glyphicon-eye-open

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

@@ -22,7 +22,11 @@
       label: 'Yes, send a payment request email to the buyer.',
       value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.mailer[:send_payment_request_to_buyer] : f.object.send_payment_request_to_buyer?)
 
-    .form-group.pull-right
+    %h3 Internal Note
+    = f.input :note_internal, label: 'Internal note', hint: 'For internal admin use only.  This note will never be displayed to the buyer.'
+
+
+    %p.text-right
       = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
       = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
       = link_to 'Cancel', effective_orders.admin_orders_path

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

@@ -0,0 +1,33 @@
+= simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.mark_as_paid_admin_order_path(order), method: :post) do |f|
+  %h3 Payment Details
+
+  - if order.purchased?
+    .alert.alert-warning Warning: This order has already been purchased
+    %br
+
+  = f.input :payment_provider,
+    as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
+    collection: EffectiveOrders.payment_providers,
+    required: true
+
+  = f.input :payment_card,
+    label: 'Payment card type, cheque or transaction number',
+    placeholder: 'Visa',
+    hint: 'Full credit card numbers should not be entered here, or anywhere.'
+
+  = f.input :payment,
+    as: :text,
+    label: 'Additional details',
+    input_html: { value: f.object.payment.kind_of?(Hash) ? f.object.payment[:details] : f.object.payment.presence }
+
+  = f.input :send_mark_as_paid_email_to_buyer,
+    as: :boolean,
+    label: 'Yes, send an email receipt to the buyer.',
+    value: (f.object.send_mark_as_paid_email_to_buyer.nil? ? EffectiveOrders.mailer[:send_order_receipts_when_mark_as_paid_by_admin] : f.object.send_mark_as_paid_email_to_buyer?)
+
+  %h3 Note to Buyer
+  = f.input :note_to_buyer, label: 'Note to buyer', hint: 'This is displayed to the buyer on all order receipts.'
+
+  %p.text-right
+    = f.button :submit, 'Mark Order as Paid', data: { disable_with: 'Saving...' }
+

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

@@ -0,0 +1,7 @@
+%h3 Internal Note
+
+= simple_form_for [:admin, order], (EffectiveOrders.admin_simple_form_options || {}).merge(url: effective_orders.admin_order_path(order)) do |f|
+  = f.input :note_internal, label: 'Internal note', hint: 'For internal admin use only.  This note will never be displayed to the buyer.'
+
+  %p.text-right
+    = f.button :submit, 'Save Internal Note', data: { disable_with: 'Saving...' }

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

@@ -0,0 +1,19 @@
+- if order.purchased?
+  .effective-order-payment-details
+    %h3 Payment Details
+    %table.table
+      %tbody
+        %tr
+          %td Provider
+          %td= order.payment_provider
+        %tr
+          %td Card
+          %td= order.payment_card || 'none'
+        %tr
+          %td Purchased at
+          %td= order.purchased_at.strftime('%Y-%m-%d %H:%M')
+        - if order.payment.present?
+          %tr
+            %td Additional details
+            %td= tableize_order_payment(order.payment[:details] || order.payment, class: 'table')
+

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

@@ -0,0 +1,7 @@
+%h2.effective-orders-page-title= (@page_title || 'Mark as Paid')
+
+%p Mark the following order as paid:
+
+= render partial: 'effective/orders/order', locals: {order: @order, no_order_actions: true}
+
+= render partial: 'admin/orders/form_mark_as_paid', locals: { order: @order }

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

@@ -1,3 +1,9 @@
 %h2.effective-orders-page-title= (@order.purchased? ? 'Receipt' : 'Order')
 
 = render partial: 'effective/orders/order', locals: {order: @order}
+
+- if (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
+  = render partial: 'admin/orders/form_note_internal', locals: { order: @order }
+
+- if (EffectiveOrders.authorized?(controller, :show, :payment_details) rescue false)
+  = render partial: 'admin/orders/order_payment_details', locals: { order: @order }

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

@@ -39,7 +39,7 @@
     - unless f.object.pending? || current_cart.try(:empty?)
       = link_to_current_cart(label: 'Change Items')
 
-    .pull-right
+    %p.text-right
       - if order.total == 0 && EffectiveOrders.allow_free_orders
         = f.submit order_checkout_label(:free), class: 'btn btn-primary', rel: :nofollow, data: {'disable_with' => 'Processing...' }
       - else

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

@@ -5,8 +5,7 @@
   = render partial: 'effective/orders/order_header', locals: {order: order}
   = render partial: 'effective/orders/order_shipping', locals: {order: order}
   = render partial: 'effective/orders/order_note', locals: {order: order}
+  = render partial: 'effective/orders/order_note_to_buyer', locals: {order: order}
   = render partial: 'effective/orders/order_items', locals: {order: order}
   = render partial: 'effective/orders/order_footer', locals: {order: order}
 
-  - if (EffectiveOrders.authorized?(controller, :show, :payment_details) rescue false)
-    = render partial: 'effective/orders/order_payment_details', locals: {order: order}

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

@@ -6,5 +6,5 @@
       = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(order), class: 'btn btn-default', data: { confirm: 'This action will email the buyer a copy of the original email receipt.  Send receipt now?', disable_with: 'Resending...' }
 
     - elsif (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
-      = link_to 'Mark as Paid', effective_orders.mark_as_paid_admin_order_path(order), class: 'btn btn-default', method: :post, data: { confirm: 'Are you sure you want to mark this order as paid?', disable_with: 'Marking as paid...' }
-      = link_to 'Send Payment Request', effective_orders.send_payment_request_admin_order_path(order), class: 'btn btn-default', method: :post, data: { confirm: 'This action will email buyer a payment request. Send it now?', disable_with: 'Sending...' }
+      = link_to 'Admin: Mark as Paid', effective_orders.mark_as_paid_admin_order_path(order), class: 'btn btn-default'
+      = link_to 'Admin: Send Payment Request', effective_orders.send_payment_request_admin_order_path(order), class: 'btn btn-default', method: :post, data: { confirm: 'This action will email buyer a payment request. Send it now?', disable_with: 'Sending...' }

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

@@ -0,0 +1,8 @@
+- if order.note_to_buyer.present?
+  %table.table
+    %thead
+      %tr
+        %th Receipt note
+    %tbody
+      %tr
+        %td= order.note_to_buyer

data/config/routes.rb

@@ -64,10 +64,11 @@ EffectiveOrders::Engine.routes.draw do
   if !EffectiveOrders.use_active_admin? || Rails.env.test?
     namespace :admin do
       resources :customers, only: [:index]
-      resources :orders, only: [:index, :show, :new, :create] do
+      resources :orders, only: [:index, :show, :update, :new, :create] do
         member do
-          post :send_payment_request
+          get :mark_as_paid
           post :mark_as_paid
+          post :send_payment_request
         end
       end
       resources :order_items, only: [:index]

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

@@ -6,6 +6,8 @@ class CreateEffectiveOrders < ActiveRecord::Migration
       t.datetime  :purchased_at
 
       t.text      :note
+      t.text      :note_to_buyer
+      t.text      :note_internal
 
       t.text      :payment
 

data/db/upgrade/03_upgrade_effective_orders_from1x.rb.erb

@@ -9,6 +9,9 @@ class UpgradeEffectiveOrdersFrom1x < ActiveRecord::Migration
     end
 
     add_column <%= @orders_table_name %>, :note, :text
+    add_column <%= @orders_table_name %>, :note_to_buyer, :text
+    add_column <%= @orders_table_name %>, :note_internal, :text
+
     add_column <%= @orders_table_name %>, :payment_provider, :string
     add_column <%= @orders_table_name %>, :payment_card, :string
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -157,7 +157,7 @@ EffectiveOrders.setup do |config|
     send_order_receipt_to_seller: true,   # Only applies to StripeConnect
     send_payment_request_to_buyer: true,
     send_pending_order_invoice_to_buyer: true,
-    send_order_receipts_when_marked_paid_by_admin: false,
+    send_order_receipts_when_mark_as_paid_by_admin: false,
 
     subject_prefix: '[example]',
     subject_for_order_receipt_to_admin: '',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,8 +316,12 @@ files:
 - app/views/admin/order_items/index.html.haml
 - app/views/admin/orders/_actions.html.haml
 - app/views/admin/orders/_form.html.haml
+- app/views/admin/orders/_form_mark_as_paid.html.haml
+- app/views/admin/orders/_form_note_internal.html.haml
 - app/views/admin/orders/_order_item_fields.html.haml
+- app/views/admin/orders/_order_payment_details.html.haml
 - app/views/admin/orders/index.html.haml
+- app/views/admin/orders/mark_as_paid.html.haml
 - app/views/admin/orders/new.html.haml
 - app/views/admin/orders/show.html.haml
 - app/views/effective/carts/_cart.html.haml
@@ -332,7 +336,7 @@ files:
 - app/views/effective/orders/_order_items.html.haml
 - app/views/effective/orders/_order_note.html.haml
 - app/views/effective/orders/_order_note_fields.html.haml
-- app/views/effective/orders/_order_payment_details.html.haml
+- app/views/effective/orders/_order_note_to_buyer.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_order_user_fields.html.haml
 - app/views/effective/orders/_orders_table.html.haml

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

@@ -1,3 +0,0 @@
-- if order.payment.present?
-  .effective-order-payment-details
-    = tableize_order_payment(order.payment, {class: 'table', title: 'Payment Details'})