effective_orders 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ad2e1c15d7e9257ce8517cdb3637cf63c83d53
-  data.tar.gz: 8b1d66707077365edfe37c1c1d69392807492684
+  metadata.gz: fc912e7bf2fc4e12905abff50fab57ca0b8479eb
+  data.tar.gz: 8da57b67b1b09169180d2782e690d0dbdc69389f
 SHA512:
-  metadata.gz: 54dfe24a820d5759ff2708472a498a435b63bc76ea60b681ef297243297dc7b8bafeeb5854f64ab83c78dbddb18a9d25c11818cf32122a2f6962d79ef563aad3
-  data.tar.gz: 8f8030d38899be69d6349551be5ba96075bfc69f2e57437a1aa812730578faee9fb9351667f6f9652f63fe56819323ce25eabcac0db60ef435f45c2f2e462194
+  metadata.gz: bbf1ba883263abc262431f857bed188b8f9de0653b93cb337ef0338b0773e537ff2d090a5c36b94d29f340b4e4e179263c2e12caff7dc420feada264256fc905
+  data.tar.gz: 29744efe4ccfdfe874b5ee905be298950d50dd59c9bdf3070df56751586e8bc9abd621c2a8bf2a2370452d3f7759fe41577e91c313b49accca2af0c3084b4be4

data/app/helpers/effective_orders_helper.rb

@@ -164,4 +164,21 @@ module EffectiveOrdersHelper
     end
   end
 
+  def payment_card_label(card)
+    case card.to_s.downcase[0]
+    when nil
+      'None'
+    when 'v'
+      'Visa'
+    when 'm'
+      'MasterCard'
+    when 'a'
+      'American Express'
+    when 'd'
+      'Discover'
+    else
+      card.to_s
+    end
+  end
+
 end

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

@@ -1,19 +1,5 @@
-- if order.purchased?
+- if order.purchased? && order.payment.present?
   .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')
+    %h3 Payment Provider Details
+    = tableize_order_payment(order.payment[:details] || order.payment, class: 'table')
 

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

@@ -7,5 +7,6 @@
   = 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_payment_details', locals: {order: order}
   = render partial: 'effective/orders/order_footer', locals: {order: order}
 

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

@@ -0,0 +1,18 @@
+- if order.purchased?
+  .effective-order-payment-details
+    %h3 Payment Details
+    %table.table
+      %tbody
+        %tr
+          %td Provider
+          %td= order.payment_provider
+        %tr
+          %td Card
+          %td
+            = payment_card_label(order.payment_card)
+            = (order.payment['f4l4'] rescue nil)
+
+        %tr
+          %td Purchased at
+          %td= order.purchased_at.strftime('%Y-%m-%d %H:%M')
+

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.1.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Code and Effect
@@ -337,6 +337,7 @@ files:
 - app/views/effective/orders/_order_note.html.haml
 - app/views/effective/orders/_order_note_fields.html.haml
 - app/views/effective/orders/_order_note_to_buyer.html.haml
+- app/views/effective/orders/_order_payment_details.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_order_terms_and_conditions_fields.html.haml
 - app/views/effective/orders/_order_user_fields.html.haml