From 0b52c0dd9aa585d3805c323a8ea21a46a9eb6ba5 Mon Sep 17 00:00:00 2001 From: Adrian Hinz Date: Mon, 21 May 2018 12:04:16 +0200 Subject: [PATCH] added status to order --- app/controllers/ps_admin/order_controller.rb | 4 ++-- app/models/order.rb | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/ps_admin/order_controller.rb b/app/controllers/ps_admin/order_controller.rb index 21db86a..87b50ef 100644 --- a/app/controllers/ps_admin/order_controller.rb +++ b/app/controllers/ps_admin/order_controller.rb @@ -9,8 +9,8 @@ module PsAdmin end def show - otp = OrderToPdf.new(@order).call - puts "#{otp.inspect}" + #otp = OrderToPdf.new(@order).call + #puts "#{otp.inspect}" end def destroy diff --git a/app/models/order.rb b/app/models/order.rb index 4d27f7c..dba8f9e 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -28,7 +28,8 @@ class Order < ApplicationRecord 3 => 'Oczekuje na płatność', 4 => 'Zapłacone', 5 => 'Wysłane', - 6 => 'Zakończone' + 6 => 'Zakończone', + 7 => 'Anulowane' }.freeze ORDER_STATUSES_HTML = { @@ -38,7 +39,8 @@ class Order < ApplicationRecord 3 => 'Oczekuje na płatność', 4 => 'Zapłacone', 5 => 'Wysłane', - 6 => 'Zakończone' + 6 => 'Zakończone', + 7 => 'Anulowane' }.freeze def order_summary