effective_orders 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 539d0efc31539d807136bcfadf062b27f942f0cb
-  data.tar.gz: 55dee53bb8235d31ab41b31e0823f4ffa1d130b6
+  metadata.gz: c7ae38c1740cd0fbe0188bb662c302c209218bcf
+  data.tar.gz: 8bc72c28a5cd18d2437068c3b43f2670ba74d140
 SHA512:
-  metadata.gz: 8a8838a34cbfa214a3c6a0954187e8b05adb2208040cab9e00243c97d890dd9b198260a39cb6170524f65a41340bd819a4cd0d15f86b075baf95d3a262673947
-  data.tar.gz: cc3d977013a3cfd8bbdbd1be68a71cfe435e331d446e2dcf39540c150f4a69c090ec4a53cf26521f0ac7710ed0a459ef395af3d7f22563d546c85f16f0a1fcaf
+  metadata.gz: ef0673ac7015c222e065432e5bd167ab759107369127a06e5816ead520293a8292affa9189a5ec637a370764cae5b6bf90e6b0990bc3101e2b2c790ead13b6ed
+  data.tar.gz: dadf0b8b6ccc382db5c4bcfe9f89989566d46cae4e926fa1914125de8a1cdbccbb55fa8398e901fcfc2becd4c9f4549c6203db6db9be0976ba9045073926552d

data/app/models/effective/order.rb

@@ -157,6 +157,18 @@ module Effective
       end
     end
 
+    def billing_name
+      if billing_address.try(:full_name).present?
+        billing_address.full_name
+      elsif user.to_s.start_with?('#<User:') == false
+        user.to_s
+      elsif user.respond_to?(:first_name) && user.respond_to?(:last_name)
+        user.first_name.to_s + ' ' + user.last_name.to_s
+      elsif user.respond_to?(:full_name)
+        user.full_name.to_s
+      end
+    end
+
     # :validate => false, :email => false
     def purchase!(payment_details = nil, opts = {})
       opts = {:validate => true, :email => true}.merge(opts)

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

@@ -1,39 +1,40 @@
+- include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? rescue false }
+
 .effective-order
-  %table.table
-    - include_download_column = order.purchased? && order.order_items.any? { |order_item| order_item.purchased_download_url.present? rescue false }
+  %table.table{:style => 'width: 600px;margin-bottom:25px;'}
+
     %thead
       %tr
-        %th.quantity Quantity
-        %th.item Item
+        %th.quantity{:style => 'text-align: left;'} Qty
+        %th.item{:style => 'text-align: left;'} Item
         - if include_download_column
-          %th.download Download
-        %th.price Price
+          %th.download{:style => 'text-align: left;'} Download
+        %th.price{:style => 'text-align: right;'} Price
+
     %tbody
       - order.order_items.each do |item|
         %tr
-          %td.quantity
-            = item.quantity
-          %td.item
+          %td.quantity{:style => 'text-align: left;'}= item.quantity
+          %td.item{:style => 'text-align: left;'}
             = item.title.html_safe
             - if order.new_record? && item.purchasable.kind_of?(Effective::Subscription)
               = render :partial => 'effective/orders/stripe/subscription_fields', :locals => {:form => form, :subscription => item.purchasable }
 
           - if include_download_column
-            %td.download
+            %td.download{:style => 'text-align: left;'}
               - if item.purchased? && (item.purchased_download_url rescue nil).present?
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'
-          %td.price
-            = price_to_currency(item.subtotal)
+          %td.price{:style => 'text-align: right;'}= price_to_currency(item.subtotal)
+
     %tfoot
       %tr
-        %th{:colspan => (include_download_column ? 3 : 2)} Subtotal
-        %td.price= price_to_currency(order.subtotal)
+        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Subtotal
+        %td.price{:style => 'text-align: right;'}= price_to_currency(order.subtotal)
       %tr
-        %th{:colspan => (include_download_column ? 3 : 2)} Tax
-        %td.price= price_to_currency(order.tax)
+        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Tax
+        %td.price{:style => 'text-align: right;'}= price_to_currency(order.tax)
       %tr
-        %th{:colspan => (include_download_column ? 3 : 2)} Total Due
-        %td.price= price_to_currency(order.total)
-
+        %th{:style => 'text-align: right;', :colspan => (include_download_column ? 3 : 2)} Total Due
+        %td.price{:style => 'text-align: right;'}= price_to_currency(order.total)

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

@@ -1,19 +1,22 @@
-%table.table
+%table.table{:style => 'width: 600px;margin-bottom:25px;'}
   %thead
     %tr
-      %th= "#{order.purchased? ? 'Sold To' : 'Bill To'}"
+      %th{:style => 'text-align: left;'}= "#{order.purchased? ? 'Sold to' : 'Bill to'}"
       - if EffectiveOrders.require_shipping_address && order.shipping_address.present?
-        %th Ship To
+        %th{:style => 'text-align: left;'} Ship to
+
   %tbody
     %tr
-      %td
-        - if order.user.to_s.start_with?('#<User:') == false && EffectiveAddresses.use_full_name == false
-          = order.user.to_s
+      %td{:style => 'text-align: left;'}
+        - if order.billing_name.present? && EffectiveAddresses.use_full_name == false
+          = order.billing_name
           %br
         = mail_to order.user.email
-        %br
+
         - if order.billing_address.present?
+          %br
           = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address}
+
       - if EffectiveOrders.require_shipping_address && order.shipping_address.present?
-        %td
+        %td{:style => 'text-align: left;'}
           = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}

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

@@ -12,7 +12,12 @@
 
   = hidden_field_tag(:email, order.user.try(:email))
   = hidden_field_tag(:cust_id, order.user.to_param)
-  = hidden_field_tag(:order_id, "#{order.to_param.to_i + EffectiveOrders.moneris[:order_nudge].to_i}")
+
+  - moneris_order_id = "#{order.to_param.to_i + EffectiveOrders.moneris[:order_nudge].to_i}"
+  - if EffectiveOrders.moneris[:include_billing_name_in_order_id] == true
+    - moneris_order_id = moneris_order_id + '-' + order.billing_name.parameterize
+
+  = hidden_field_tag(:order_id, moneris_order_id)
   = hidden_field_tag(:gst, '%.2f' % (order.tax / 100.0))
   = hidden_field_tag(:charge_total, '%.2f' % (order.total / 100.0))
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -143,7 +143,8 @@ EffectiveOrders.setup do |config|
       :hpp_key => '',
       :hpp_url => 'https://www3.moneris.com/HPPDP/index.php',
       :verify_url => 'https://www3.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0
+      :order_nudge => 0,
+      :include_billing_name_in_order_id => false
     }
   else
     config.moneris = {
@@ -151,7 +152,8 @@ EffectiveOrders.setup do |config|
       :hpp_key => '',
       :hpp_url => 'https://esqa.moneris.com/HPPDP/index.php',
       :verify_url => 'https://esqa.moneris.com/HPPDP/verifyTxn.php',
-      :order_nudge => 0
+      :order_nudge => 0,
+      :include_billing_name_in_order_id => false
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails