effective_orders 2.1.8 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f154bcf1f7cdb3364371b6b2c794c9d4ac232397
-  data.tar.gz: f852ff91b864ffd6a443e0a7fe5a3d23aa4fd1cf
+  metadata.gz: 8856c89b4fe9a94251e4cf26f463f73206cfdff1
+  data.tar.gz: 557f83e8ad8e2c83a1fae4e9898472d9188c757a
 SHA512:
-  metadata.gz: f6810b9d5300273c7c7b4eafa63b800a6c7a1e58ea0acaf7453785fb030333b13db4f5a4d1287e6db739c2ea6217f100774ab1e3a18074f847e4bdbc9f79a13c
-  data.tar.gz: 4bf6074ecb430326d9a76bace99020685ddb0bad4d4f279fc443dcf3434adef7cccdc06afd773016de172e9696d30663b59cda1556e9b318341a05983087e776
+  metadata.gz: feb2f941ea0eb87892f58e9a6ef299f9274ff58ba5d545920b7b831bbc3036be3e5d06044753afa63b6544ffbffb01a880dd6ecb681a8c43d8fba1a7779d1aaf
+  data.tar.gz: 53cc8dc2d59ac523c333e1b3dd8856f857703f0cf72341dbeed60a1f32365366d3488b67c87443f3b1921d40b139d56855cfebf4fd95a7fc38052cfb71e35fc5

data/app/controllers/admin/orders_controller.rb

@@ -73,6 +73,20 @@ module Admin
       end
     end
 
+    def destroy
+      @order = Effective::Order.find(params[:id])
+
+      authorize_effective_order!
+
+      if @order.destroy
+        flash[:success] = 'Successfully deleted order'
+      else
+        flash[:danger] = "Unable to delete order: #{@order.errors.full_messages.to_sentence}"
+      end
+
+      redirect_to(effective_orders.admin_orders_path)
+    end
+
     def mark_as_paid
       @order = Effective::Order.find(params[:id])
       @page_title = 'Mark as Paid'

data/app/models/effective/datatables/orders.rb

@@ -52,7 +52,7 @@ if defined?(EffectiveDatatables)
 
           table_column :total, as: :price
 
-          table_column :payment_provider, label: 'Provider', visible: false, filter: { values: ['nil'] + EffectiveOrders.payment_providers }
+          table_column :payment_provider, label: 'Provider', visible: false, filter: { values: ['nil'] + (EffectiveOrders.payment_providers + EffectiveOrders.other_payment_providers).sort }
           table_column :payment_card, label: 'Card'
 
           table_column :note, visible: false

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

@@ -1,6 +1,9 @@
+= link_to (datatables_admin_path? ? effective_orders.admin_order_path(order) : effective_orders.order_path(order)), title: 'View' do
+  %span.glyphicon.glyphicon-eye-open
+
 - 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
+  = link_to effective_orders.admin_order_path(order), title: 'Delete', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.' } do
+    %span.glyphicon.glyphicon-trash

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

@@ -7,4 +7,5 @@
 
     - elsif (EffectiveOrders.authorized?(controller, :admin, :effective_orders) rescue false)
       = 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...' }
+      = link_to 'Admin: Send Payment Request', effective_orders.send_payment_request_admin_order_path(order), class: 'btn btn-default', data: { method: :post, confirm: 'This action will email buyer a payment request. Send it now?', disable_with: 'Sending...' }
+      = link_to 'Admin: Delete', effective_orders.admin_order_path(order), class: 'btn btn-default', data: { method: :delete, confirm: 'Are you sure you want to delete? This cannot be undone.', disable_with: 'Deleting...' }

data/config/routes.rb

@@ -64,7 +64,7 @@ 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, :update, :new, :create] do
+      resources :orders, except: [:edit] do
         member do
           get :mark_as_paid
           post :mark_as_paid

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.8'.freeze
+  VERSION = '2.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails