git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

javascript is card true

Browse Source
This commit is contained in:
Yan
2017-11-28 16:47:12 +06:30
parent 93db6130a1
commit 6cae1b613c
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/CRM.scss
View File

@@ -114,9 +114,11 @@
.green{ .green{
background-color: #009900; background-color: #009900;
} }
.left{
.left-margin-1 {
margin-left:1px; margin-left:1px;
} }
.bottom{ .bottom{
margin-bottom:1px; margin-bottom:1px;
} }

2
app/controllers/origami/discounts_controller.rb
View File

@@ -163,7 +163,7 @@ class Origami::DiscountsController < BaseOrigamiController
# Check for Card Payment # Check for Card Payment
is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments) 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) account_types = Account.where("discount=?",true)
table_id = sale.bookings[0].dining_facility_id table_id = sale.bookings[0].dining_facility_id
table_type = DiningFacility.find(table_id).type table_type = DiningFacility.find(table_id).type

30
app/views/crm/dining_queues/_form.html.erb
View File

@@ -29,9 +29,9 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-l--5"> <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 m-l--5">
<div class="row m-l--5"> <div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="1" data-type="num">1</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-3 left cashier_number" data-value="2" data-type="num">2</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="2" data-type="num">2</div>
<div class="col-md-3 left cashier_number" data-value="3" data-type="num">3</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="3" data-type="num">3</div>
</div> </div>
</div> </div>
</div> </div>
@@ -39,9 +39,9 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-12 m-l--5"> <div class="col-md-12 m-l--5">
<div class="row m-l--5"> <div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="4" data-type="num">4</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-3 left cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="5" data-type="num">5</div>
<div class="col-md-3 left cashier_number" data-value="6" data-type="num">6</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="6" data-type="num">6</div>
</div> </div>
</div> </div>
</div> </div>
@@ -49,9 +49,9 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-12 m-l--5"> <div class="col-md-12 m-l--5">
<div class="row m-l--5"> <div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="7" data-type="num">7</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-3 left cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="8" data-type="num">8</div>
<div class="col-md-3 left cashier_number" data-value="9" data-type="num">9</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="9" data-type="num">9</div>
</div> </div>
</div> </div>
</div> </div>
@@ -59,9 +59,9 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-12 m-l--5"> <div class="col-md-12 m-l--5">
<div class="row m-l--5"> <div class="row m-l--5">
<div class="col-md-3 left cashier_number" data-value="0" data-type="num">0</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-3 left cashier_number" data-value="." data-type="num">.</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="." data-type="num">.</div>
<div class="col-md-3 left cashier_number" data-value="00" data-type="num">00</div> <div class="col-md-3 left-margin-1 cashier_number" data-value="00" data-type="num">00</div>
</div> </div>
</div> </div>
</div> </div>
@@ -69,9 +69,9 @@
<div class="row bottom"> <div class="row bottom">
<div class="col-md-12 m-l--5"> <div class="col-md-12 m-l--5">
<div class="row m-l--5"> <div class="row m-l--5">
<div class="col-md-3 left cashier_number"></div> <div class="col-md-3 left-margin-1 cashier_number"></div>
<div class="col-md-3 left cashier_number red" data-type="del">DEL</div> <div class="col-md-3 left-margin-1 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div> <div class="col-md-3 left-margin-1 cashier_number green" data-type="clr">CLR</div>
</div> </div>
</div> </div>
</div> </div>