diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 7f9192f2..3d6fda2b 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -114,9 +114,11 @@ .green{ background-color: #009900; } -.left{ + +.left-margin-1 { margin-left:1px; } + .bottom{ margin-bottom:1px; } diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 2e94fe1c..678c955b 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -163,7 +163,7 @@ class Origami::DiscountsController < BaseOrigamiController # Check for Card Payment is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments) - if is_card_payment != true + if is_card != true account_types = Account.where("discount=?",true) table_id = sale.bookings[0].dining_facility_id table_type = DiningFacility.find(table_id).type diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb index 7796e9a9..51e2c097 100755 --- a/app/views/crm/dining_queues/_form.html.erb +++ b/app/views/crm/dining_queues/_form.html.erb @@ -29,9 +29,9 @@