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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

Browse Source
This commit is contained in:
Yan
2017-10-10 17:19:17 +06:30
parent b1261f4d27 33f03b2e05
commit 7df01dd0a2
49 changed files with 1443 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/application.js
View File

@@ -13,7 +13,6 @@
//= require jquery //= require jquery
//= require jquery_nested_form //= require jquery_nested_form
//= require tether //= require tether
//= require bootstrap/js/bootstrap.js
//= require bootstrap/js/popper.min //= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs //= require jquery_ujs
@@ -37,6 +36,7 @@
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js
//= require BSBMaterial/pages/index.js //= require BSBMaterial/pages/index.js
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require BSBMaterial/pages/forms/basic-form-elements

2
app/controllers/inventory/inventory_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::InventoryController < BaseInventoryController class Inventory::InventoryController < ApplicationController#BaseInventoryController
def index def index
@products = InventoryDefinition.all.active.order('created_at desc') @products = InventoryDefinition.all.active.order('created_at desc')

2
app/controllers/inventory/inventory_definitions_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::InventoryDefinitionsController < BaseInventoryController class Inventory::InventoryDefinitionsController < ApplicationController#BaseInventoryController
before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy] before_action :set_inventory_definition, only: [:show, :edit, :update, :destroy]
# GET /inventory_definitions # GET /inventory_definitions

2
app/controllers/inventory/stock_check_items_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::StockCheckItemsController < BaseInventoryController class Inventory::StockCheckItemsController < ApplicationController#BaseInventoryController
before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy] before_action :set_stock_check_item, only: [:show, :edit, :update, :destroy]
# GET /stock_check_items # GET /stock_check_items

2
app/controllers/inventory/stock_checks_controller.rb
View File

@@ -1,4 +1,4 @@
class Inventory::StockChecksController < BaseInventoryController class Inventory::StockChecksController < ApplicationController#BaseInventoryController
def index def index
@check = StockCheck.new @check = StockCheck.new
@inventory_definitions = InventoryDefinition.active.all @inventory_definitions = InventoryDefinition.active.all

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

@@ -1,4 +1,4 @@
class Origami::CardPaymentsController < BaseOrigamiController class Origami::CardPaymentsController < ApplicationController#BaseOrigamiController
def index def index

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

@@ -1,4 +1,4 @@
class Origami::CashInsController < BaseOrigamiController class Origami::CashInsController < ApplicationController#BaseOrigamiController
def new def new
end end

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

@@ -1,4 +1,4 @@
class Origami::CashOutsController < BaseOrigamiController class Origami::CashOutsController < ApplicationController#BaseOrigamiController
def new def new
end end

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

@@ -1,4 +1,4 @@
class Origami::CreditPaymentsController < BaseOrigamiController class Origami::CreditPaymentsController < ApplicationController#BaseOrigamiController
def index def index

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

@@ -1,4 +1,4 @@
class Origami::DiscountsController < BaseOrigamiController class Origami::DiscountsController < ApplicationController#BaseOrigamiController
authorize_resource :class => false authorize_resource :class => false
#discount page show from origami index with selected order #discount page show from origami index with selected order

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

@@ -1,4 +1,4 @@
class Origami::InDutiesController < BaseOrigamiController class Origami::InDutiesController < ApplicationController#BaseOrigamiController
before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty] before_action :set_in_duty, only: %i[show edit update edit_in_duty update_for_in_duty destroy destroy_in_duty]
# GET /in_duties # GET /in_duties

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

@@ -1,4 +1,4 @@
class Origami::JcbController < BaseOrigamiController class Origami::JcbController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::MasterController < BaseOrigamiController class Origami::MasterController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::MoveroomController < BaseOrigamiController class Origami::MoveroomController < ApplicationController#BaseOrigamiController
authorize_resource :class => false authorize_resource :class => false

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

@@ -1,4 +1,4 @@
class Origami::MovetableController < BaseOrigamiController class Origami::MovetableController < ApplicationController#BaseOrigamiController
authorize_resource :class => false authorize_resource :class => false

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

@@ -1,4 +1,4 @@
class Origami::MpuController < BaseOrigamiController class Origami::MpuController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::OtherChargesController < BaseOrigamiController class Origami::OtherChargesController < ApplicationController#BaseOrigamiController
authorize_resource :class => false authorize_resource :class => false
def index def index

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

@@ -1,4 +1,4 @@
class Origami::OthersPaymentsController < BaseOrigamiController class Origami::OthersPaymentsController < ApplicationController#BaseOrigamiController
def index def index

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

@@ -1,4 +1,4 @@
class Origami::PaymentsController < BaseOrigamiController class Origami::PaymentsController < ApplicationController#BaseOrigamiController
authorize_resource :class => false authorize_resource :class => false
def index def index

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

@@ -1,4 +1,4 @@
class Origami::PayparPaymentsController < BaseOrigamiController class Origami::PayparPaymentsController < ApplicationController#BaseOrigamiController
def create def create
sale_id = params[:sale_id] sale_id = params[:sale_id]
redeem_amount = params[:redeem_amount] redeem_amount = params[:redeem_amount]

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

@@ -1,4 +1,4 @@
class Origami::ProductCommissionsController < BaseOrigamiController class Origami::ProductCommissionsController < ApplicationController#BaseOrigamiController
before_action :set_product_commission, only: [:show, :edit, :update, :destroy] before_action :set_product_commission, only: [:show, :edit, :update, :destroy]
# GET /product_commissions # GET /product_commissions

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

@@ -1,4 +1,4 @@
class Origami::RedeemPaymentsController < BaseOrigamiController class Origami::RedeemPaymentsController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]
payment_method = params[:payment_method] payment_method = params[:payment_method]

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

@@ -1,4 +1,4 @@
class Origami::RoomInvoicesController < BaseOrigamiController class Origami::RoomInvoicesController < ApplicationController#BaseOrigamiController
def index def index
@room = DiningFacility.find(params[:room_id]) @room = DiningFacility.find(params[:room_id])
puts "room bookig lenght" puts "room bookig lenght"

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

@@ -1,4 +1,4 @@
class Origami::SalesController < BaseOrigamiController class Origami::SalesController < ApplicationController#BaseOrigamiController
def show def show
@tables = Table.all.active.order('status desc') @tables = Table.all.active.order('status desc')

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

@@ -1,4 +1,4 @@
class Origami::ShiftsController < BaseOrigamiController class Origami::ShiftsController < ApplicationController#BaseOrigamiController
def index def index
end end

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

@@ -1,4 +1,4 @@
class Origami::TableInvoicesController < BaseOrigamiController class Origami::TableInvoicesController < ApplicationController#BaseOrigamiController
def index def index
@table = DiningFacility.find(params[:table_id]) @table = DiningFacility.find(params[:table_id])
puts "table bookig lenght" puts "table bookig lenght"

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

@@ -1,4 +1,4 @@
class Origami::VisaController < BaseOrigamiController class Origami::VisaController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

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

@@ -1,4 +1,4 @@
class Origami::VoucherController < BaseOrigamiController class Origami::VoucherController < ApplicationController#BaseOrigamiController
def index def index
@sale_id = params[:sale_id] @sale_id = params[:sale_id]

2
app/views/crm/customers/index.html.erb
View File

@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
<button type="submit" class="btn bg-blue waves-effect waves-effect">Search</button> <button type="submit" class="btn bg-blue waves-effect">Search</button>
</div> </div>
<!-- <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12" id="member_acc_no"> --> <!-- <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12" id="member_acc_no"> -->
<button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button> <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>

2
app/views/inventory/inventory/_inventory_list.html.erb
View File

@@ -1,7 +1,7 @@
<div class="row"> <div class="row">
<div class="col-md-8"><h2> Inventoy Product Lists</h2></div> <div class="col-md-8"><h2> Inventoy Product Lists</h2></div>
<div class="col-md-4"><button id='new_inventory_product' class='btn btn-primary' style='margin-top:15px;'>New Inventory Product</button></div> <div class="col-md-4"><button id='new_inventory_product' class='btn bg-blue waves-effect' style='margin-top:15px;'>New Inventory Product</button></div>
</div> </div>
<div class="row"> <div class="row">

11
app/views/inventory/inventory/index.html.erb
View File

@@ -1,16 +1,17 @@
<div class="row"> <div class="container-fluid">
<div class="row">
<div class="col-lg-10 col-md-10 col-sm-10"> <div class="col-lg-10 col-md-10 col-sm-10">
<%= render 'inventory_list' %> <%= render 'inventory_list' %>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %> <% if current_login_employee.role == "administrator" || current_login_employee.role == 'manager' %>
<button id="back" type="button" class="btn btn-block btn-primary"> Back</button> <button id="back" type="button" class="btn bg-default waves-effect"> Back</button>
<% end %> <% end %>
<button id="stock_taking" type="button" class="btn btn-block btn-primary"> New Stock Taking</button> <button id="stock_taking" type="button" class="btn bg-blue waves-effect"> New Stock Taking</button>
<button id="stock_check_report" type="button" class="btn btn-block btn-primary"> Stock Check Report</button> <button id="stock_check_report" type="button" class="btn bg-blue waves-effect"> Stock Check Report</button>
</div>
</div> </div>
</div> </div>
<script> <script>
$('#stock_taking').on('click', function () { $('#stock_taking').on('click', function () {
window.location.href = '<%= inventory_stock_checks_path %>'; window.location.href = '<%= inventory_stock_checks_path %>';

4
app/views/inventory/inventory_definitions/_form.html.erb
View File

@@ -45,8 +45,8 @@
</div> </div>
<div class="form-actions"> <div class="form-actions">
<%= link_to 'Back', inventory_path, class: 'btn btn-success' %> <%= link_to 'Back', inventory_path, class: 'btn bg-default waves-effect' %>
<%= f.button :submit, class: 'btn btn-primary' %> <%= f.button :submit, class: 'btn bg-blue wave' %>
</div> </div>
<% end %> <% end %>

2
app/views/inventory/inventory_definitions/index.html.erb
View File

@@ -1,3 +1,4 @@
<div class="container-fluid">
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<h1>Inventory Definitions</h1> <h1>Inventory Definitions</h1>
@@ -23,3 +24,4 @@
<br> <br>
<%= link_to 'New Inventory Definition', new_inventory_definition_path %> <%= link_to 'New Inventory Definition', new_inventory_definition_path %>
</div>

5
app/views/inventory/inventory_definitions/new.html.erb
View File

@@ -1,5 +1,5 @@
<div class="container-fluid">
<div class="span12"> <div class="col">
<div class="page-header"> <div class="page-header">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="<%= root_path %>">Home</a></li> <li><a href="<%= root_path %>">Home</a></li>
@@ -9,3 +9,4 @@
</div> </div>
<%= render 'form', inventory: @inventory_definition %> <%= render 'form', inventory: @inventory_definition %>
</div> </div>
</div>

54
app/views/origami/cash_ins/new.html.erb
View File

@@ -1,50 +1,62 @@
<div class="container-fluid">
<div class='row'> <div class='row'>
<div class="col-lg-11 col-md-11 col-sm-11"> <div class="col-lg-10 col-md-10 col-sm-10">
<h2> Cash In </h2> <h2> Cash In </h2>
<br> <br>
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>
<td> Payment Reference <td> Payment Reference
</td> </td>
<td><input type='text' id='reference'/></td> <td>
<input type="text" class="form-control" placeholder="Reference" id="reference">
</td>
</tr> </tr>
<tr> <tr>
<td> Remark <td> Remark
</td> </td>
<td><input type="text" id='remark'/></td> <td>
<input type="text" class="form-control" placeholder="Remark" id="remark">
</td>
</tr> </tr>
<tr> <tr>
<td> Payment Method <td> Payment Method
</td> </td>
<td> <td>
<button class='btn btn-primary payment-type' data-id='cash' id='cash'>CASH</button> <button class='btn bg-blue waves-effect payment-type' data-id='cash' id='cash'>CASH</button>
<button class='btn btn-primary payment-type' data-id='mpu' id='mpu'>MPU</button> <button class='btn bg-blue waves-effect payment-type' data-id='mpu' id='mpu'>MPU</button>
<button class='btn btn-primary payment-type' data-id='visa' id='visa'>VISA</button> <button class='btn bg-blue waves-effect payment-type' data-id='visa' id='visa'>VISA</button>
<button class='btn btn-primary payment-type' data-id='jcb' id='jcb'>JCB</button> <button class='btn bg-blue waves-effect payment-type' data-id='jcb' id='jcb'>JCB</button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> Reference Number <td> Reference Number
</td> </td>
<td><input type='text' id='payment_method_reference'/></td> <td>
<input type="text" class="form-control" id="payment_method_reference">
</td>
</tr> </tr>
<tr> <tr>
<td> Amount <td> Amount
</td> </td>
<td><input type='text' id='amount'/></td> <td>
<input type="text" class="form-control" placeholder="Amount" id="amount">
</td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-2 col-md-2 col-sm-2 ">
<button type="button" class="btn btn-primary btn-block" id='back'> Back </button> <div class="button-demo">
<button type="button" class="btn btn-primary btn-block" id='cash_in'> Cash In </button> <button type="button" class="btn bg-default waves-effect btn-" id='back'> Back </button>
<button type="button" class="btn bg-blue waves-effect btn-" id='cash_in'> Cash In </button>
</div>
</div>
</div> </div>
</div> </div>
<script> <script>
var payment_method = ""; var payment_method = "";
$('.payment-type').on('click',function(){ $('.payment-type').on('click',function(){
$('.payment-type').css("background-color","#7a62d3") $('.payment-type').css("background-color","#7a62d3")
$(this).css("background-color","green"); $(this).css("background-color","green");
var type = $(this).attr('data-id') var type = $(this).attr('data-id')
@@ -57,8 +69,8 @@ $('.payment-type').on('click',function(){
}else if(type == 'jcb'){ }else if(type == 'jcb'){
payment_method = "jcb"; payment_method = "jcb";
} }
}) })
$('#cash_in').on('click',function(){ $('#cash_in').on('click',function(){
var reference = $('#reference').val(); var reference = $('#reference').val();
var remark = $('#remark').val(); var remark = $('#remark').val();
var amount = $('#amount').val(); var amount = $('#amount').val();
@@ -70,8 +82,8 @@ $('#cash_in').on('click',function(){
window.location.href = '/origami'; window.location.href = '/origami';
} }
}); });
}) })
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami'; window.location.href = '/origami';
}) })
</script> </script>

40
app/views/origami/cash_outs/new.html.erb
View File

@@ -1,36 +1,32 @@
<div class="container-fluid">
<div class='row'>
<div class='row'> <div class="col-lg-10 col-md-10 col-sm-10">
<div class="col-lg-11 col-md-11 col-sm-11">
<h2>Cash Out</h2> <h2>Cash Out</h2>
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>
<td> Payment Reference <td> Payment Reference</td>
</td> <td><input type="text" class="form-control" placeholder="Reference" id="reference"></td>
<td><input id='reference' type='text' value=''/></td>
</tr> </tr>
<tr> <tr>
<td> Remark <td> Remark</td>
</td> <td><input type="text" class="form-control" placeholder="Remark" id="remark"></td>
<td><input id='remark' type="text" value=''/></td>
</tr> </tr>
<tr> <tr>
<td> Amount <td> Amount </td>
</td> <td><input type="text" class="form-control" placeholder="Amount" id="amount"></td>
<td><input id='amount' type="text" value=''/></td>
</tr> </tr>
</table> </table>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-2 col-md-2 col-sm-2">
<button type="button" class="btn btn-primary btn-block" id='back'> Back </button> <br><br>
<button type="button" class="btn btn-primary btn-block" id='cash_out'> Cash Out </button> <button type="button" class="btn bg-default btn-block" id='back'> Back </button>
<button type="button" class="btn bg-blue btn-block" id='cash_out'> Cash Out </button>
</div>
</div> </div>
</div> </div>
<script> <script>
$('#cash_out').on('click',function(){ $('#cash_out').on('click',function(){
var reference = $('#reference').val(); var reference = $('#reference').val();
var remark = $('#remark').val(); var remark = $('#remark').val();
var amount = $('#amount').val(); var amount = $('#amount').val();
@@ -41,9 +37,9 @@ $('#cash_out').on('click',function(){
window.location.href = '/origami'; window.location.href = '/origami';
} }
}); });
}) })
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami'; window.location.href = '/origami';
}) })
</script> </script>

92
app/views/origami/credit_payments/index.html.erb
View File

@@ -1,6 +1,5 @@
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -9,41 +8,56 @@
</div> </div>
<div class="card" style="margin-top:10px;padding-top:20px;"> <div class="card" style="margin-top:10px;padding-top:20px;">
<div class="rebate-form"> <div class="rebate-form">
<!-- <div class="row"> -->
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-5 col-md-5 col-sm-5">
<label class="col-lg-4 col-md-4 col-sm-4">You can pay up to </label> <label>You can pay up to </label>
<input type="text" name="validamount" id="validamount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@can_credit %>" data-member-value=""> </div>
<div class="col-lg-6 col-md-6 col-sm-6">
<input type="text" name="validamount" id="validamount" class="form-control" readonly="" value="<%=@can_credit %>" data-member-value="">
</div>
</div> </div>
<hr> <hr>
</div> <!-- </div> -->
<% if @creditcount != 0 %> <% if @creditcount != 0 %>
<div class="row"> <!-- <div class="row"> -->
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class=" row">
<label class="col-lg-4 col-md-4 col-sm-4">Recent Credit Amount </label> <div class="col-lg-5 col-md-5 col-sm-5">
<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@creditcount %>" data-member-value=""> <label>Recent Credit Amount </label>
</div>
<hr>
</div>
<% end %>
<div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12">
<label class="col-lg-4 col-md-4 col-sm-4">Recent Credit Amount</label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" value="" data-value="<%=@sale_id %>" data-member-value="">
</div>
<hr>
</div>
<div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12">
<label class="col-lg-4 col-md-4 col-sm-4">Amount</label>
<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
</div>
<hr>
</div>
</div>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6">
<input type="text" name="" class="form-control " readonly="" value="<%=@creditcount %>" data-member-value="">
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;"> </div>
<hr>
<!-- </div> -->
<% end %>
<!-- <div class="row"> -->
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-5">
<label >Recent Credit Amount</label>
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value="">
</div>
</div>
<hr>
<!-- </div> -->
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-5">
<label>Amount</label>
</div>
<div class="col-lg-7 col-md-7 col-sm-7">
<div id="amount" class="form-control">0.0</div>
</div>
<hr>
</div>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-6" style="margin-top:75px;">
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-1 col-sm-1"> <div class="col-lg-6 col-md-1 col-sm-1">
@@ -88,21 +102,21 @@
</div> </div>
</div> </div>
</div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
</div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn bg-blue btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment';"> Back </button>
</div>
</div>
</div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){} if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
else { else {
$('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash"))); $('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash")));
} }
}); });
$(document).on('click', '.cashier_number', function(event){ $(document).on('click', '.cashier_number', function(event){
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
if(event.handled !== true) { if(event.handled !== true) {

96
app/views/origami/discounts/index.html.erb
View File

@@ -1,3 +1,4 @@
<div class="container-fluid">
<div class="row"> <div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
@@ -85,13 +86,13 @@
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- Column One --> <!-- Column One -->
<!-- Column Two --> <!-- Column Two -->
<div class="col-lg-5 col-md-5 col-sm-5"> <div class="col-lg-5 col-md-5 col-sm-5">
<!-- Discount Amount --> <!-- Discount Amount -->
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
@@ -108,7 +109,7 @@
<% <%
@accounts.each do |acc| @accounts.each do |acc|
%> %>
<button id="account-<%= acc.id %>" class="accounts-type btn btn-default"><%= acc.title %></button> <button id="account-<%= acc.id %>" class="accounts-type btn bg-default"><%= acc.title %></button>
<% end %> <% end %>
</div> </div>
</div> </div>
@@ -124,20 +125,24 @@
<div class="fluid cashier_number" data-value="5" data-type="add">5%</div> <div class="fluid cashier_number" data-value="5" data-type="add">5%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="1" data-type="num">1</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="2" data-type="num">2</div> <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-4 left cashier_number" data-value="3" data-type="num">3</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
<div class="row bottom"> <div class="row bottom clearfix">
<div class="col-md-3"> <div class="col-md-3">
<div class="fluid cashier_number" data-value="10" data-type="add">10%</div> <div class="fluid cashier_number" data-value="10" data-type="add">10%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="4" data-type="num">4</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-4 left cashier_number" data-value="6" data-type="num">6</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -146,9 +151,11 @@
<div class="fluid cashier_number" data-value="15" data-type="add">15%</div> <div class="fluid cashier_number" data-value="15" data-type="add">15%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="7" data-type="num">7</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-4 left cashier_number" data-value="9" data-type="num">9</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -157,9 +164,11 @@
<div class="fluid cashier_number" data-value="20" data-type="add">20%</div> <div class="fluid cashier_number" data-value="20" data-type="add">20%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="0" data-type="num">0</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="." data-type="num">.</div> <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-4 left cashier_number" data-value="00" data-type="num">00</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -168,18 +177,20 @@
<div class="fluid cashier_number" data-value="30" data-type="add">30%</div> <div class="fluid cashier_number" data-value="30" data-type="add">30%</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number"></div> <div class="row">
<div class="col-md-4 left cashier_number red" data-type="del">DEL</div> <div class="col-md-3 cashier_number"></div>
<div class="col-md-4 left cashier_number green" data-type="clr">CLR</div> <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<button id="net" class="btn btn-info fluid action-btn">Nett</button> <button id="net" class="btn bg-info fluid action-btn">Nett</button>
<button id="percentage" class="btn btn-primary fluid action-btn">Percentage</button> <button id="percentage" class="btn bg-primary fluid action-btn">Percentage</button>
<button id="remove-item" class="btn btn-default fluid action-btn">Clear Discount</button> <button id="remove-item" class="btn bg-default fluid action-btn">Clear Discount</button>
</div> </div>
</div> </div>
</div> </div>
@@ -191,10 +202,10 @@
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Action Panel --> <!-- Action Panel -->
<div> <div>
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button>
<button id="remove-item-discount" class="btn btn-warning btn-block action-btn">RemoveItem Discount</button> <button id="remove-item-discount" class="btn btn-warning btn- action-btn">Remove Item Discount</button>
<button id="remove-all" class="btn btn-warning btn-block action-btn">Remove All</button> <button id="remove-all" class="btn bg-warning btn-block action-btn">Remove All</button>
<button id="pay-discount" class="btn btn-danger btn-block action-btn">Enter</button> <button id="pay-discount" class="btn bg-danger btn-block action-btn">Enter</button>
<% if @member_discount%> <% if @member_discount%>
<!-- <hr /> <!-- <hr />
<button id="member-discount" class="btn btn-success btn-block action-btn <button id="member-discount" class="btn btn-success btn-block action-btn
@@ -203,9 +214,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$(".cashier_number").on('click', function(event){ $(".cashier_number").on('click', function(event){
if(event.handled !== true) { if(event.handled !== true) {
var original_value=0; var original_value=0;
@@ -510,7 +522,7 @@ $(document).ready(function(){
url: ajax_url, url: ajax_url,
data: params, data: params,
success:function(result){ success:function(result){
console.log(result) console.log(result)
if (result.status == "Success") { if (result.status == "Success") {
type = 'green' type = 'green'
btn_color = 'btn-green' btn_color = 'btn-green'
@@ -558,15 +570,15 @@ console.log(result)
});//end member discount });//end member discount
}); });
/* Remove Selection */ /* Remove Selection */
function selection_remove(){ function selection_remove(){
$(".item-row").removeClass("selected-item"); $(".item-row").removeClass("selected-item");
$(".discount_item_row").removeClass("selected-item"); $(".discount_item_row").removeClass("selected-item");
$(".accounts-type").removeClass("selected-account"); $(".accounts-type").removeClass("selected-account");
} }
/* Get Item rows but not discount*/ /* Get Item rows but not discount*/
function get_item_rows(){ function get_item_rows(){
var sale_items = []; var sale_items = [];
$('.item-row').not('.discount-item-row').each(function(i){ $('.item-row').not('.discount-item-row').each(function(i){
var sale_item = {}; var sale_item = {};
@@ -577,10 +589,10 @@ function get_item_rows(){
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
/* Get discount Item rows */ /* Get discount Item rows */
function get_discount_item_rows(){ function get_discount_item_rows(){
var sale_items = []; var sale_items = [];
$('.discount-item-row').each(function(i){ $('.discount-item-row').each(function(i){
var sale_item = {}; var sale_item = {};
@@ -591,9 +603,9 @@ function get_discount_item_rows(){
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
/* Get discount Item rows */ /* Get discount Item rows */
// function get_selected_discount_items(){ // function get_selected_discount_items(){
// var sale_items = []; // var sale_items = [];
// $('.discount-item-row').hasClass('.selected-item').each(function(i){ // $('.discount-item-row').hasClass('.selected-item').each(function(i){

8
app/views/origami/in_duties/_form.html.erb
View File

@@ -16,12 +16,12 @@
</div><br> </div><br>
<div class="form-group"> <div class="form-group">
<% f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %> <% f.button :submit, "Create", :class => 'btn bg-blue ', :id => 'create' %>
<% f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %> <% f.button :submit, "Update", :class => 'btn bg-blue ', :disabled => '', :id => 'update' %>
<% f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %> <% f.button :button, "Reset", :class => 'btn bg-danger ', :id => 'reset' %>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<%= f.button :submit, :class => 'btn btn-primary' %> <%= f.button :submit, :class => 'btn bg-blue' %>
</div> </div>
<% end %> <% end %>

4
app/views/origami/in_duties/assign_in_duty.html.erb
View File

@@ -22,10 +22,10 @@
<div class="form-actions"> <div class="form-actions">
<div class='row'> <div class='row'>
<div class="col-md-2"> <div class="col-md-2">
<%= link_to 'Back', origami_index_in_duty_path(@table.id), class: 'btn btn-success' %> <%= link_to 'Back', origami_index_in_duty_path(@table.id), class: 'btn bg-default' %>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<button type="button" class="btn btn-primary btn-block" id='in_duty'>Create In Duty</button> <button type="button" class="btn bg-blue btn-block" id='in_duty'>Create In Duty</button>
</div> </div>
</div> </div>
</div> </div>

5
app/views/origami/in_duties/index.html.erb
View File

@@ -1,3 +1,4 @@
<div class="conatiner-fluid">
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
@@ -34,14 +35,14 @@
<%= render 'form', in_duty: @in_duty, table: @table %> <%= render 'form', in_duty: @in_duty, table: @table %>
</div> </div>
<span style="float: right"> <span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_duty_path, :class => 'btn btn-primary btn-sm' %> <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_duty_path, :class => 'btn bg-blue' %>
</span> </span>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<button type="button" class="btn btn-primary btn-block" id='back'>Back</button> <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).on('click', ".induty_tr", function () { $(document).on('click', ".induty_tr", function () {

71
app/views/origami/other_charges/index.html.erb
View File

@@ -1,3 +1,4 @@
<div class="container-fluid">
<div class="row"> <div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
@@ -92,10 +93,10 @@
<div class="card-title"> <div class="card-title">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="-group">
<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" /> <input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" />
</div> </div>
<div class="form-group"> <div class="-group">
<textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea> <textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea>
</div> </div>
</div> </div>
@@ -111,9 +112,11 @@
<div class="fluid cashier_number" data-value="3000" data-type="add">3000</div> <div class="fluid cashier_number" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="1" data-type="num">1</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="2" data-type="num">2</div> <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
<div class="col-md-4 left cashier_number" data-value="3" data-type="num">3</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -122,9 +125,11 @@
<div class="fluid cashier_number" data-value="5000" data-type="add">5000</div> <div class="fluid cashier_number" data-value="5000" data-type="add">5000</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="4" data-type="num">4</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="5" data-type="num">5</div> <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
<div class="col-md-4 left cashier_number" data-value="6" data-type="num">6</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -133,9 +138,11 @@
<div class="fluid cashier_number" data-value="10000" data-type="add">10000</div> <div class="fluid cashier_number" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="7" data-type="num">7</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="8" data-type="num">8</div> <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
<div class="col-md-4 left cashier_number" data-value="9" data-type="num">9</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -144,9 +151,11 @@
<div class="fluid cashier_number" data-value="15000" data-type="add">15000</div> <div class="fluid cashier_number" data-value="15000" data-type="add">15000</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number" data-value="0" data-type="num">0</div> <div class="row">
<div class="col-md-4 left cashier_number" data-value="." data-type="num">.</div> <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
<div class="col-md-4 left cashier_number" data-value="00" data-type="num">00</div> <div class="col-md-3 left 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>
</div> </div>
</div> </div>
@@ -155,17 +164,19 @@
<div class="fluid cashier_number" data-value="20000" data-type="add">20000</div> <div class="fluid cashier_number" data-value="20000" data-type="add">20000</div>
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="col-md-4 cashier_number"></div> <div class="row">
<div class="col-md-4 left cashier_number red" data-type="del">DEL</div> <div class="col-md-3 cashier_number"></div>
<div class="col-md-4 left cashier_number green" data-type="clr">CLR</div> <div class="col-md-3 left cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 left cashier_number green" data-type="clr">CLR</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<button id="add_charges" class="btn btn-info fluid action-btn">Add</button> <button id="add_charges" class="btn bg-info fluid action-btn">Add</button>
<button id="remove-item" class="btn btn-default fluid action-btn">Remove</button> <button id="remove-item" class="btn bg-danger fluid action-btn">Remove</button>
</div> </div>
</div> </div>
</div> </div>
@@ -177,12 +188,12 @@
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Action Panel --> <!-- Action Panel -->
<div> <div>
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami';"><i class="fa fa-arrow-left"></i> Back </button>
<button id="charge_other" class="btn btn-danger btn-block action-btn">Enter</button> <button id="charge_other" class="btn bg-success btn-block action-btn">Enter</button>
</div> </div>
</div> </div>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
$(".cashier_number").on('click', function(event){ $(".cashier_number").on('click', function(event){
@@ -290,15 +301,15 @@
}); });
}); });
/* Remove Selection */ /* Remove Selection */
function selection_remove(){ function selection_remove(){
$(".item-row").removeClass("selected-item"); $(".item-row").removeClass("selected-item");
$(".discount_item_row").removeClass("selected-item"); $(".discount_item_row").removeClass("selected-item");
$(".accounts-type").removeClass("selected-account"); $(".accounts-type").removeClass("selected-account");
} }
/* Get discount Item rows */ /* Get discount Item rows */
function get_other_item_rows(){ function get_other_item_rows(){
var sale_items = []; var sale_items = [];
$('.other-item-row').each(function(i){ $('.other-item-row').each(function(i){
var sale_item = {}; var sale_item = {};
@@ -308,9 +319,9 @@ function get_other_item_rows(){
sale_items.push(sale_item); sale_items.push(sale_item);
}); });
return sale_items; return sale_items;
} }
function item_row_template(sale_id, charge_amount, reasons){ function item_row_template(sale_id, charge_amount, reasons){
var item_row = "<tr class='other-item-row' id='SLI-000000000000'>" + var item_row = "<tr class='other-item-row' id='SLI-000000000000'>" +
"<td style='width: 60%; text-align: left;'>" + "<td style='width: 60%; text-align: left;'>" +
"<span id='item_account_type' class='hidden'>" + "<span id='item_account_type' class='hidden'>" +
@@ -330,6 +341,6 @@ function item_row_template(sale_id, charge_amount, reasons){
"</td>" + "</td>" +
"</tr>"; "</tr>";
return item_row; return item_row;
} }
</script> </script>

21
app/views/origami/others_payments/index.html.erb
View File

@@ -1,5 +1,6 @@
<div class="row"> <div class="container-fluid">
<div class="col-lg-11col-md-11 col-sm-11"> <div class="row">
<div class="col-lg-11col-md-11 col-sm-11">
<div > <div >
<div > <div >
<% @payment_method_setting.where("is_active = true").each do |payment_method|%> <% @payment_method_setting.where("is_active = true").each do |payment_method|%>
@@ -7,21 +8,21 @@
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" id='back'>Back</button> <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
</div>
</div>
</div> </div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$('.others-payment').on('click',function(){ $('.others-payment').on('click',function(){
var input_type = $(this).attr("data-type"); var input_type = $(this).attr("data-type");
var sale_id = $(this).attr("data-sale-id"); var sale_id = $(this).attr("data-sale-id");
window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type; window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type;
}) })
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami/sale/<%= @sale_id %>/payment/'; window.location.href = '/origami/sale/<%= @sale_id %>/payment/';
}) })
</script> </script>

22
app/views/origami/payments/show.html.erb
View File

@@ -1,7 +1,9 @@
<div id="loading_wrapper" style="display:none;"> <div class="container-fluid">
<div id="loading_wrapper" style="display:none;">
<div id="loading"></div> <div id="loading"></div>
</div> </div>
<div class="row">
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-3"> <div class="col-lg-6 col-md-6 col-sm-3">
<div class="card" > <div class="card" >
<div class="card-header"> <div class="card-header">
@@ -242,15 +244,15 @@
</div> </div>
<div class="col-lg-6 col-md-1 col-sm-1"> <div class="col-lg-6 col-md-1 col-sm-1">
<div class="row bottom"> <div class="row bottom">
<div class="cashier_number long" data-value="1000" data-type="add">1000</div> <div class="cashier_number long left" data-value="1000" data-type="add">1000</div>
<div class="cashier_number long left" data-value="3000" data-type="add">3000</div> <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="cashier_number long" data-value="5000" data-type="add">5000</div> <div class="cashier_number long left" data-value="5000" data-type="add">5000</div>
<div class="cashier_number long left" data-value="10000" data-type="add">10000</div> <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class="pay purple" id="pay">Pay</div> <div class="pay purple left" id="pay">Pay</div>
</div> </div>
</div> </div>
</div> </div>
@@ -259,12 +261,12 @@
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<!-- Waiter Buttons --> <!-- Waiter Buttons -->
<button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button> <button type="button" class="btn bg-default btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
<button type="button" class="btn btn-primary btn-block" id="foc"> FOC </button> <button type="button" class="btn bg-warning btn-block" id="foc"> FOC </button>
<button type="button" class="btn btn-primary btn-block" id="void"> Void </button> <button type="button" class="btn bg-red btn-block" id="void"> Void </button>
</div> </div>
</div>
</div> </div>
<script> <script>

4
app/views/origami/product_commissions/load_commissioners.html.erb
View File

@@ -1,4 +1,5 @@
<div class="row"> <div class="container-fludi">
<div class="row">
<!-- Column One --> <!-- Column One -->
<div class="col-lg-5 col-md-5 col-sm-5" style="height: 100%"> <div class="col-lg-5 col-md-5 col-sm-5" style="height: 100%">
<div class="card"> <div class="card">
@@ -111,6 +112,7 @@
<button type="button" class="btn btn-primary btn-block" id='back'>Back</button> <button type="button" class="btn btn-primary btn-block" id='back'>Back</button>
<!--<button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>--> <!--<button type="button" class="btn btn-primary btn-block" id='apply'>Apply</button>-->
</div> </div>
</div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {

2
app/views/origami/redeem_payments/index.html.erb
View File

@@ -91,7 +91,7 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn bg-default btn-lg btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

29
app/views/origami/shifts/new.html.erb
View File

@@ -1,23 +1,24 @@
<h1>Open Cashier</h1> <div class="container-fluid">
<br> <h1>Open Cashier</h1>
<br>
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<table class='table table-striped'> <table class='table table-striped'>
<tr> <tr>
<th>Cashier Terminal</th> <th>Cashier Terminal</th>
<th> <th>
<select class='form-control' id='cashier_terminal'> <select class="form-control show-tick" id='cashier_terminal'>
<% @terminal.each do |ter| %> <% @terminal.each do |ter| %>
<option value="<%= ter.id %>"><%= ter.name %></option> <option value="<%= ter.id %>" ><%= ter.name %></option>
<% end %> <% end %>
</select> </select>
</th> </th>
</tr> </tr>
<% @float.each do |float| %> <% @float.each do |float| %>
<tr> <tr>
<th><%= float.name %></th> <th><%= float.name %></th>
<th><input class='float-value' type='text' data-value ="<%= float.value %>" value='0' id='<%= float.value %>'></input></th> <th><input class='float-value form-control' type='text' data-value ="<%= float.value %>" value='0' id='<%= float.value %>'></input></th>
</tr> </tr>
<% end %> <% end %>
<tr> <tr>
@@ -59,14 +60,14 @@
</div> </div>
</div> </div>
</div>
</div> </div>
<script> <script>
var float_value = "" var float_value = ""
var total = 0 var total = 0
$(document).on('focusout', '.float-value', function(event){ $(document).on('focusout', '.float-value', function(event){
float_value = $(this).attr("data-value"); float_value = $(this).attr("data-value");
$(document).on('click', '.cashier_number', function(event){ $(document).on('click', '.cashier_number', function(event){
if(event.handled !== true) { if(event.handled !== true) {
@@ -106,9 +107,9 @@ $(document).on('focusout', '.float-value', function(event){
return false; return false;
} }
}); });
}) })
$('#open_cashier').on('click',function(){ $('#open_cashier').on('click',function(){
var cashier_terminal = $('#cashier_terminal').val(); var cashier_terminal = $('#cashier_terminal').val();
var amount = $('#total').text()||0; var amount = $('#total').text()||0;
$.ajax({type: "POST", $.ajax({type: "POST",
@@ -120,5 +121,5 @@ $('#open_cashier').on('click',function(){
} }
} }
}); });
}) })
</script> </script>

21
app/views/origami/shifts/show.html.erb
View File

@@ -1,5 +1,5 @@
<div class="container-fluid">
<div class='row'> <div class='row clearfix'>
<div class='col-md-10'> <div class='col-md-10'>
<h1>Close Cashier</h1> <h1>Close Cashier</h1>
<br> <br>
@@ -15,22 +15,23 @@
</table> </table>
<hr> <hr>
<div class='row'> <div class='row clearfix '>
<div class='col-md-5'> <div class='col-md-5'>
<span style='font-size:20px;'><b>Closing Balance</b></span> <span style='font-size:20px;'><b>Closing Balance</b></span>
</div> </div>
<div class='col-md-6'> <div class='col-md-6'>
<span style='font-size:20px;'><b><input type='text' id='closing_balance_amount' value=''></b></span> <span style='font-size:20px;'><b><input type='text' class="form-control" id='closing_balance_amount' value=''></b></span>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2"> <div class="col-lg-2 col-md-2 col-sm-2">
<button type="button" class="btn btn-primary btn-block" id='back'> Back </button> <button type="button" class="btn bg-default btn-block" id='back'> Back </button>
<button type="button" class="btn btn-primary btn-block green" id='close_cashier'> Close Cashier </button> <button type="button" class="btn bg-blue btn-block green" id='close_cashier'> Close Cashier </button>
</div>
</div> </div>
</div> </div>
<script> <script>
$('#close_cashier').on('click',function(){ $('#close_cashier').on('click',function(){
var amount = $('#closing_balance_amount').val(); var amount = $('#closing_balance_amount').val();
var shift_id = "<%= @shift.id rescue ""%>" var shift_id = "<%= @shift.id rescue ""%>"
$.ajax({type: "POST", $.ajax({type: "POST",
@@ -41,8 +42,8 @@ $('#close_cashier').on('click',function(){
window.location.href = '/'; window.location.href = '/';
} }
}); });
}) })
$('#back').on('click',function(){ $('#back').on('click',function(){
window.location.href = '/origami'; window.location.href = '/origami';
}) })
</script> </script>

11
app/views/origami/visa/index.html.erb
View File

@@ -1,6 +1,5 @@
<div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-5 col-sm-3"> <div class="col-lg-5 col-md-5 col-sm-3">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -41,7 +40,7 @@
<div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div> <div id="amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
</div> </div>
<hr> <hr>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -94,10 +93,10 @@
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-primary btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button> <button type="button" class="btn bg-default btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/payment/others_payment';"> Back </button>
</div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){} if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}