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

Edit Dashboard's photo and Add Bread Crumb Name

Browse Source
This commit is contained in:
San Wai Lwin
2018-03-15 13:46:40 +06:30
parent 20333f6a2e
commit 96f8640df7
49 changed files with 122 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/assets/javascripts/origami.js
View File

@@ -16,6 +16,43 @@
//= require BSBMaterial/demo.js
//= require custom.js
/* Constant Varaibles */
_ADD_ORDER_ = "/   ADD ORDER";
_CASH_IN_ = "/   CASH IN";
_CASH_OUT_ = "/   CASH OUT";
_CASH_MGMT_ = "/   CASH MGMT";
_CREDIT_PAYMENTS_ = "/   CREDIT PAYMENTS";
_CUSTOMERS_ = "/   CUSTOMERS";
_DASHBOARD_ = "/   DASHBOARD";
_DISCOUNTS_ = "/   DISCOUNTS";
_CASHIER_ = "/   CASHIER";
_IN_DUTIES_ = "/   IN DUTIES";
_JCB_ = "/   JCB PAYMENT";
_MASTER_ = "/   MASTER PAYMENT";
_MOVE_ROOM_ = "/   MOVE ROOM";
_MOVE_TABLE_ = "/   MOVE TABLE";
_MPU_ = "/   MPU PAYMENT";
_ORDERS_ = "/   ORDERS";
_OTHER_CHARGES_ = "/   OTHER CHARGES";
_OTHER_PAYMENTS_ = "/   OTHER PAYMENTS";
_PAYMENTS_ = "/   PAYMENTS";
_PAYPAR_PAYMENT_ = "/   PAYPAR PAYMENT";
_PENDING_ORDER_ = "/   PENDING ORDER";
_PRODUCT_COMMISSIONS_= "/   PRODUCT COMMISSIONS";
_REDEEM_PAYMENT_ = "/   REDEEM PAYMENT";
_ROOM_INVOICES_ = "/   ROOM INVOICES";
_ROOM_ = "/   ROOM";
_SALE_EDIT_ = "/   SALE EDIT";
_SECOND_DISPLAY_ = "/   CUSTOMER VIEW";
_CLOSE_CASHIER_ = "/   CLOSE CASHIER";
_SPLIT_BILL_ = "/   SPLIT BILL";
_TABLE_INVOICE_ = "/   TABLE INVOICE";
_UNION_ = "/   UNION PAYMENT";
_VISA_ = "/   VISA PAYMENT";
_VOUCHER_ = "/   VOUCHER";
_TABLE_ = "/   TABLE";
_SURVEY_ = "/   SURVEY";
/* Constant Varaibles */
$(document).on('turbolinks:load', function() {
@@ -356,4 +393,8 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun
});
}
}
//end CB ECR integration
//end CB ECR integration
function setHeaderBreadCrumb(params){
$("#others_payment").html(params);
}

9
app/assets/stylesheets/login.scss
View File

@@ -92,5 +92,12 @@
}
.style_image{
height : 107px;
height : 138px;
padding : 20px 0 20px 0;
width : 70%;
}
.style_icon{
font-size: 111px;
padding : 20px 0 20px 0;
}

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

@@ -9,7 +9,6 @@ class Origami::JcbController < BaseOrigamiController
@jcbcount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

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

@@ -9,7 +9,6 @@ class Origami::MasterController < BaseOrigamiController
@mastercount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

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

@@ -8,7 +8,6 @@ class Origami::MpuController < BaseOrigamiController
@mpucount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

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

@@ -6,7 +6,6 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
@membership_rebate_balance=0
sale_data = Sale.find_by_sale_id(@sale_id)
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
# if @shop.is_rounding_adj
# new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

1
app/controllers/origami/surveys_controller.rb
View File

@@ -5,7 +5,6 @@ class Origami::SurveysController < BaseOrigamiController
@id = params[:id]
@cashier_type = params[:type]
if(@id[0,3] == "SAL")
@sale = Sale.find(@id)
@receipt_no = @sale.receipt_no

1
app/controllers/origami/unionpay_controller.rb
View File

@@ -8,7 +8,6 @@ class Origami::UnionpayController < BaseOrigamiController
@unionpaycount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

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

@@ -8,7 +8,6 @@ class Origami::VisaController < BaseOrigamiController
@visacount = 0
others = 0
@payment_method_setting_nav = PaymentMethodSetting.all
@shop = Shop::ShopDetail
if @shop.is_rounding_adj
new_total = Sale.get_rounding_adjustment(sale_data.grand_total)

15
app/views/layouts/_header.html.erb
View File

@@ -27,12 +27,10 @@
<img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span>
</a>
<% if @payment_method_setting_nav.present? %>
<span class="navbar-brand m-0">/ &nbsp;
<span id="otherPayment"></span>&nbsp; Payment
</span>
<% end %>
<span class="navbar-brand m-0">/ &nbsp;
<span id="others_payment"></span>
</span>
</div>
<!-- Start Shop Info -->
<div class="navbar-right">
@@ -83,11 +81,6 @@
</nav>
<script type="text/javascript">
if((document.getElementById("otherPayment")!=undefined) && (document.getElementById("otherPayment")!=null) && (document.getElementById("otherPayment")!="")){
var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
document.getElementById("otherPayment").innerHTML = otherPayment;
}
$(function(){
$('.delete').click(function(){
var method = $(this).attr('data-method');

10
app/views/layouts/login_dashboard.html.erb
View File

@@ -166,7 +166,7 @@
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons" style="font-size: 100px;">person</i>
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
@@ -189,7 +189,7 @@
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons md-48" style="font-size: 100px;">person</i>
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
@@ -213,7 +213,7 @@
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons md-48" style="font-size: 100px;">person</i>
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
@@ -237,7 +237,7 @@
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons md-48" style="font-size: 100px;">person</i>
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>
@@ -261,7 +261,7 @@
</div>
<% else %>
<div class="login_dashboard p-card">
<i class="material-icons md-48" style="font-size: 100px;">person</i>
<i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b>
</div>
</div>

1
app/views/origami/addorders/detail.html.erb
View File

@@ -488,6 +488,7 @@
jQuery('.first_'+id).click();
});
$(document).ready(function () {
setHeaderBreadCrumb(_ADD_ORDER_);
$(".tables").on('click', function () {
$('.tables').css('background-color','');
$('.tables').removeClass('purple')

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

@@ -56,6 +56,9 @@
</div>
<script>
$(document).ready(function () {
setHeaderBreadCrumb(_CASH_IN_);
});
var payment_method = "";
$('.payment-type').on('click',function(){
$('.payment-type').css("background-color","#7a62d3")

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

@@ -1,2 +1,2 @@
<h1>CashMgmt#index</h1>
<p>Find me in app/views/cash_mgmt/index.html.erb</p>
<p>Find me in app/views/cash_mgmt/index.html.erb</p>

3
app/views/origami/cash_mgmt/new.html.erb
View File

@@ -1,2 +1,5 @@
<h1>CashMgmt#new</h1>
<p>Find me in app/views/cash_mgmt/new.html.erb</p>
$(document).ready(function () {
setHeaderBreadCrumb(_CASH_MGMT_);
});

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

@@ -25,7 +25,9 @@
</div>
</div>
<script>
$(document).ready(function () {
setHeaderBreadCrumb(_CASH_OUT_);
});
$('#cash_out').on('click',function(){
var reference = $('#reference').val();
var remark = $('#remark').val();

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

@@ -118,6 +118,7 @@
<span id="cashier_type" class="hidden"><%=@cashier_type%></span>
<script>
$(document).ready(function() {
setHeaderBreadCrumb(_CREDIT_PAYMENTS_);
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
else {
$('#validamount').attr("value",parseFloat("<%= @can_credit %>") - parseFloat(localStorage.getItem("cash")));

4
app/views/origami/customers/index.html.erb
View File

@@ -288,6 +288,10 @@
}
});
$(document).ready(function () {
setHeaderBreadCrumb(_CUSTOMERS_);
});
// Read Card Reader
$("#member_acc_no").on('click', function(e){
var cardNo = "";

3
app/views/origami/dashboard/index.html.erb
View File

@@ -191,6 +191,9 @@
</div>
<script>
$(document).ready(function () {
setHeaderBreadCrumb(_DASHBOARD_);
});
$(".cashier_view").on('click', function() {
window.location.href = '/origami';

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

@@ -235,6 +235,7 @@
<script type="text/javascript">
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function(){
setHeaderBreadCrumb(_DISCOUNTS_);
$('#back').on('click',function(){
var id = $("#table_id").text();

1
app/views/origami/home/index.html.erb
View File

@@ -139,6 +139,7 @@
<!-- Column One -->
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_CASHIER_);
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id;

1
app/views/origami/home/show.html.erb
View File

@@ -543,6 +543,7 @@
<script>
var cashier_type = "cashier";
$(document).ready(function () {
setHeaderBreadCrumb(_TABLE_);
/* start check first bill or not*/
var receipt_no = "";
if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){

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

@@ -60,6 +60,7 @@
<script type="text/javascript">
$(document).ready(function () {
setHeaderBreadCrumb(_IN_DUTIES_);
});

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

@@ -44,6 +44,7 @@
</div>
</div>
<script type="text/javascript">
$(document).on('click', ".induty_tr", function () {
$(this).closest('tr').find('.checkbox_check').prop("checked", true);

1
app/views/origami/jcb/index.html.erb
View File

@@ -121,6 +121,7 @@
<script>
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_JCB_);
var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>";
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}

1
app/views/origami/master/index.html.erb
View File

@@ -122,6 +122,7 @@
<script>
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_MASTER_);
var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>";
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}

1
app/views/origami/moveroom/move_dining.html.erb
View File

@@ -166,6 +166,7 @@
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_MOVE_ROOM_);
$(".tables").on('click', function(){
$('.tables').removeClass('selected-item');
$(this).addClass('selected-item');

1
app/views/origami/movetable/move_dining.html.erb
View File

@@ -284,6 +284,7 @@ end
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_MOVE_TABLE_);
$(".tables").on('click', function(){
$('.tables').removeClass('selected-item');
$(this).addClass('selected-item');

1
app/views/origami/mpu/index.html.erb
View File

@@ -124,6 +124,7 @@
<script>
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_MPU_);
var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>";

1
app/views/origami/orders/show.html.erb
View File

@@ -253,6 +253,7 @@
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_ORDERS_);
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/' + dining_id;

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

@@ -210,7 +210,8 @@
<script type="text/javascript">
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function(){
$(document).ready(function(){
setHeaderBreadCrumb(_OTHER_CHARGES_);
$(".cashier_number").on('click', function(event){
if(event.handled !== true) {
var original_value=0;

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

@@ -27,6 +27,9 @@
</div>
<input type="hidden" id="server_mode" value="<%= ENV["SERVER_MODE"] %>">
<script type="text/javascript">
$(document).ready(function () {
setHeaderBreadCrumb(_OTHER_PAYMENTS_);
});
/* start check first bill or not*/
var cashier_type = "<%= @cashier_type %>";
var receipt_no = "";

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

@@ -461,6 +461,7 @@ var cashier_type = "<%= @cashier_type %>";
var customer_id = "<%= @customer.id %>";
var customer_name = "<%= @customer.name %>";
$(document).ready(function(){
setHeaderBreadCrumb(_PAYMENTS_);
//start customer modal popup
if((customer_id!=undefined) && (customer_id!=null) && (customer_id!="")){
if((customer_id == 'CUS-000000000001') && (customer_name == 'WALK-IN')){

7
app/views/origami/paypar_payments/index.html.erb
View File

@@ -13,4 +13,9 @@
<button type="button" class="btn bg-default m- btn-block" onclick="window.location.href = '/origami/sale/<%= @sale_id %>/<%= @cashier_type %>/payment';"> Back </button>
</div>
<div>
<div>
<script>
$(document).ready(function () {
setHeaderBreadCrumb(_PAYPAR_PAYMENT_);
});
</script>

3
app/views/origami/pending_order/index.html.erb
View File

@@ -39,6 +39,9 @@
</div>
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_PENDING_ORDER_);
});
cashier_type = "quick_service"
$(".sales").on('click',function(){
var sale_id = $(this).attr("data-id");

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

@@ -121,6 +121,7 @@
</div>
<script>
$(document).ready(function () {
setHeaderBreadCrumb(_PRODUCT_COMMISSIONS_);
var selected_sale_item = 0;
$('.sale_item').on('click', function () {

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

@@ -109,6 +109,7 @@
<script type="text/javascript">
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_REDEEM_PAYMENT_);
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
else {
$('#redeemamt').attr("value",parseFloat("<%= @redeem_prices %>") - parseFloat(localStorage.getItem("cash")));

1
app/views/origami/room_invoices/index.html.erb
View File

@@ -82,6 +82,7 @@
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_ROOM_INVOICES_);
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/<%= @room.id %>/table_invoice/' + dining_id;

1
app/views/origami/rooms/show.html.erb
View File

@@ -484,6 +484,7 @@
<script>
var cashier_type = "cashier";
$(document).ready(function(){
setHeaderBreadCrumb(_ROOM_);
// $(".tables").on('click', function(){
// var customer_id=$(".customer-id").text();
// show_customer_details(customer_id);

2
app/views/origami/sale_edit/edit.html.erb
View File

@@ -189,6 +189,8 @@
var cashier_type = "<%= @cashier_type %>";
// Bill Request
$(document).ready(function () {
setHeaderBreadCrumb(_SALE_EDIT_);
$('.editModal').on('click', function () {
$("#action").attr('data-type', $(this).attr('data-type'));
$("#action").attr('data-id', $(this).attr('data-id'));

1
app/views/origami/second_display/index.html.erb
View File

@@ -10,6 +10,7 @@
</div>
<script type="text/javascript">
$(document).ready(function () {
setHeaderBreadCrumb(_SECOND_DISPLAY_);
$('#s_reload').on('click', function () {
window.location.href = '/origami/second_display';
});

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

@@ -58,6 +58,9 @@
</div>
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_CLOSE_CASHIER_);
});
$('#close_cashier').on('click',function(){
var amount = $('#closing_balance_amount').val();
var shift_id = "<%= @shift.id rescue ""%>"

1
app/views/origami/split_bill/index.html.erb
View File

@@ -332,6 +332,7 @@
var split_sale_id = "";
var split_receipt_no = "";
$(document).ready(function(){
setHeaderBreadCrumb(_SPLIT_BILL_);
$('#back').on('click',function(){
backToOrigami();
})

1
app/views/origami/surveys/_form.html.erb
View File

@@ -196,6 +196,7 @@
<script type="text/javascript">
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function(){
setHeaderBreadCrumb(_SURVEY_);
//click add button for new row
$('#addForeigner').on('click',function(){
$('#newTemplate').removeClass('hidden');

1
app/views/origami/table_invoices/index.html.erb
View File

@@ -82,6 +82,7 @@
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_TABLE_INVOICE_);
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;

1
app/views/origami/table_invoices/show.html.erb
View File

@@ -212,6 +212,7 @@
</div>
<script>
$(document).ready(function(){
setHeaderBreadCrumb(_TABLE_INVOICE_);
$(".tables").on('click', function(){
var dining_id = $(this).attr("data-id");
window.location.href = '/origami/table/<%= @table.id %>/table_invoice/' + dining_id;

1
app/views/origami/unionpay/index.html.erb
View File

@@ -123,6 +123,7 @@
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_UNION_);
var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>";

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

@@ -122,6 +122,7 @@
<script>
var cashier_type = "<%= @cashier_type %>";
$(document).ready(function() {
setHeaderBreadCrumb(_VISA_);
var sale_id = "<%= @sale_id %>";
var bank_integration = "<%= @bank_integration %>";

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

@@ -98,6 +98,8 @@
<script>
$(document).ready(function() {
setHeaderBreadCrumb(_VOUCHER_);
if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
else {
$('#validamount').attr("value",parseFloat("<%= @can_voucher %>") - parseFloat(localStorage.getItem("cash")));