effective_orders 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 087ee5d1dd1c2882afcbe2f455c21b9c9a88fb84
-  data.tar.gz: c51480679d42773312d8fd384515f3ca302dfaf2
+SHA256:
+  metadata.gz: 5d975c31db44e626807e5a0f7b1ccb5c21016034daeaad2aef937a79894a322e
+  data.tar.gz: 5c0ced22f719a0e4c63004d7e0a973f7ae1415665788c0e7bab17519fe23c5e8
 SHA512:
-  metadata.gz: ae149e37f2810d9dea9cb2c2177e2349f7addd84cc53d3350836f2605c84ec958e8d5691750785aa7a3f3e247e3302756663e73bd205712d86f6d8cd01c641b5
-  data.tar.gz: f52633ba98f00efe3c71740f7385106a9e557fbc3773d0f2c372a677ad1ff668585022ad3d7da952a2172e290bb9109e7295cb0a908146215dfbff248fb4aac0
+  metadata.gz: c2ab9082782d9ed8a5cf18881a1c2a6db96a863a7df47862053fa2a951c8d43c9ba7b5f5527a39f0f71a26ccf55fa477fb9c7605eb3352bef71affd1a84879c3
+  data.tar.gz: b2241e34923fa1a102f96957763e3eaac53079f2c71c82a2863aae3a589659bcee0d536e07a92f4912025efd7621b9ca568d5ac988bfcf7af06622e1c93ca3b4

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018 Code and Effect Inc.
+Copyright 2019 Code and Effect Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/datatables/effective_orders_datatable.rb

@@ -22,7 +22,14 @@ class EffectiveOrdersDatatable < Effective::Datatable
 
     col :purchased_at
 
-    col :id
+    if EffectiveOrders.obfuscate_order_ids
+      col(:id, as: :obfuscated_id) do |order|
+        obfuscated_id = order.to_param
+        link_to(obfuscated_id, (admin_namespace? ? effective_orders.admin_order_path(obfuscated_id) : effective_orders.order_path(obfuscated_id)))
+      end
+    else
+      col :id
+    end
 
     if attributes[:user_id].blank?
       col :user, label: 'Buyer', search: :string, sort: :email do |order|
@@ -48,14 +55,14 @@ class EffectiveOrdersDatatable < Effective::Datatable
       col :shipping_address
     end
 
-    col :purchase_state, label: 'State', search: { collection: EffectiveOrders::PURCHASE_STATES.invert } do |order|
+    col :purchase_state, label: 'State', search: { collection: EffectiveOrders::PURCHASE_STATES.invert, value: 'purchased' } do |order|
       EffectiveOrders::PURCHASE_STATES[order.purchase_state]
     end
 
     col :order_items, search: { as: :string }
 
-    col :subtotal, as: :price
-    col :tax, as: :price
+    col :subtotal, as: :price, visible: false
+    col :tax, as: :price, visible: false
 
     col :tax_rate, visible: false do |order|
       tax_rate_to_percentage(order.tax_rate)

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

@@ -10,7 +10,8 @@
       %tr
         %td
           - if order.billing_address.present?
-            = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address}
+            = render :partial => 'effective/addresses/address',
+              locals: {address: order.billing_address, email: order.user.email }
           - else
             = order.billing_name
             %br

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -269,8 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts