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

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

Browse Source
This commit is contained in:
Yan
2017-10-30 10:37:36 +06:30
parent 8169da4d52 74e90c98d3
commit 558ec84819
6 changed files with 93 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/views/crm/customers/_new_form.html.erb
View File

@@ -4,14 +4,14 @@
<%= f.hidden_field :id, :class => "form-control " %>
<div class="form-group">
<label>Salutation :</label><br>
<label>Mr</label>
<label> <%= t("views.right_panel.detail.salutation") %> :</label><br>
<label><%= t("views.right_panel.detail.mr") %></label>
<%= f.radio_button :salutation,"Mr", :class => "salutation mr with-gap radio-col-indigo", :value=>"Mr", :style=>"width: 30px"%>
<label>Miss</label>
<label><%= t("views.right_panel.detail.miss") %></label>
<%= f.radio_button :salutation,"Mrs", :class => "salutation mrs with-gap radio-col-indigo", :value=>"Mrs", :style=>"width: 30px"%>
<label>Mrs</label>
<label><%= t("views.right_panel.detail.mrs") %></label>
<%= f.radio_button :salutation,"Miss", :class => "salutation miss with-gap radio-col-indigo", :value=>"Miss", :style=>"width: 30px"%>
<label>Mdm</label>
<label><%= t("views.right_panel.detail.mdm") %></label>
<%= f.radio_button :salutation,"Mdm", :class => "salutation mdm with-gap radio-col-indigo", :value=>"Mdm", :style=>"width: 30px"%>
</div>
@@ -27,11 +27,11 @@
</div>
<div class="form-group">
<label>Gender :</label><br>
<label>Male</label>
<label><%= t("views.right_panel.detail.gender") %> :</label><br>
<label><%= t("views.right_panel.detail.male") %></label>
<%= f.radio_button :gender,"Male", :class => "gender male", :value=>"Male", :style=>"width: 30px"%>
<label>Female</label>
<%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
<label><%= t("views.right_panel.detail.female") %></label>
<%= f.radio_button :gender,"Female", :class => "gender female", :value=>"Female", :style=>"width: 30px"%>
</div>
<div class="form-group">
@@ -75,7 +75,7 @@
</div>
<div class="form-group">
<label>Sr.No</label>
<label><%= t("views.right_panel.detail.sr_no") %></label>
<div class="form-line disabled">
<input type="text" name="" value="<%=@count_customer%>" class="form-control" disabled="" >
</div>
@@ -83,12 +83,12 @@
</div>
<div class="form-group">
<label>Date Of Birth</label>
<label><%= t("views.right_panel.detail.date_of_birth") %></label>
<%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
</div>
<div class="form-group">
<label>Select Customer Type</label>
<label><%= t("views.right_panel.detail.select_customer_type") %></label>
<select class="form-control col-md-12 selectpicker show-tick" id="customer_type" name="customer[customer_type]" style="height: " >
<% Lookup.where("lookup_type = ?", "customer_type" ).each do |ct| %>
<option value="<%= ct.value %>">
@@ -112,7 +112,7 @@
</div>
<div class="form-group">
<label>Paypar Account No:</label>
<label><%= t("views.right_panel.detail.paypar_account_no") %>:</label>
<div class="-group">
<input type="text" class="form-control" id="paypar_account_no" name="customer[paypar_account_no]" readonly/>
<div class="input-group-addon"><span class="fa fa-credit-card"></span></div>
@@ -120,9 +120,9 @@
</div>
<div class="form-group">
<label>Select Member Group</label>
<label><%= t("views.right_panel.detail.select_membership_group") %></label>
<select class="form-control col-md-12 selectpicker show-tick" name="member_group_id" style="height: " >
<option value="">Select Membership Group</option>
<option value=""><%= t("views.right_panel.detail.select_membership_group") %></option>
<% Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
<option value="<%= member.value %>">
<%= member.name %></option>
@@ -132,15 +132,17 @@
</div>
<div class="form-group">
<%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
<%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %>
<button type="button" class="btn btn-danger" id="reset">Reset</button>
<!-- <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
<%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %> -->
<button type="submit" class="btn btn-primary" id="submit_customer"><%= t("views.btn.submit") %></button>
<button type="submit" class="btn btn-info" disabled id="update_customer"><%= t("views.btn.update") %></button>
<button type="button" class="btn btn-danger" id="reset"><%= t("views.btn.reset") %></button>
</div>
<%end%>
<div id="sxModal">
<div id="sxModal-Content"><h3>Card Tap</h3></div>
<div id="sxModal-Content"><h3><%= t :card_tap %></h3></div>
</div>
<!-- The modal -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="modalLabelLarge" aria-hidden="true">

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

@@ -39,10 +39,10 @@
<input type="hidden" name="type" id="type" value="">
</div>
<!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
<button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;">Search</button>
<button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;"><%= t("views.btn.search") %></button>
<!-- </div> -->
<button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">Member Card</button>
<button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">QR CODE</button>
<button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.memeber_card") %></button>
<button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;"><%= t("views.btn.qr_code") %></button>
</div>
<% end %>

65
app/views/crm/customers/show.html.erb
View File

@@ -5,13 +5,13 @@
<ul class="nav nav-tabs tab-nav-right" role="tablist">
<li role="presentation" class="active nav-item">
<a class="nav-link" data-toggle="tab" href="#customer" >Customer Details</a>
<a class="nav-link" data-toggle="tab" href="#customer" ><%= t :customer_details %></a>
</li>
<li role="presentation" class="nav-item" >
<a class="nav-link" data-toggle="tab" href="#order" >Order Details</a>
<a class="nav-link" data-toggle="tab" href="#order" ><%= t :order_details %></a>
</li>
<li role="presentation" class="nav-item" >
<a class="nav-link" data-toggle="tab" href="#sale" >Sale Details</a>
<a class="nav-link" data-toggle="tab" href="#sale" ><%= t :sale_details %></a>
</li>
</ul>
<!-- Nav tabs - End -->
@@ -24,15 +24,15 @@
<table class="table table-striped">
<thead>
<tr>
<th>Card No</th>
<th>Name</th>
<th>Company</th>
<th>Contact no</th>
<th>Email</th>
<th>NRC/Passport No</th>
<th>Address</th>
<th>DOB</th>
<th>Membership Type</th>
<th><%= t("views.right_panel.detail.card_no") %></th>
<th><%= t("views.right_panel.detail.name") %></th>
<th><%= t("views.right_panel.detail.company") %></th>
<th><%= t("views.right_panel.detail.contact_no") %></th>
<th><%= t("views.right_panel.detail.email") %></th>
<th><%= t("views.right_panel.detail.nrc_passport_no") %></th>
<th><%= t("views.right_panel.detail.address") %></th>
<th><%= t("views.right_panel.detail.dob") %></th>
<th><%= t("views.right_panel.detail.membership_type") %></th>
</tr>
</thead>
@@ -65,13 +65,13 @@
<table class="table table-striped">
<thead>
<tr>
<th>Date</th>
<th><%= t("views.right_panel.detail.date") %></th>
<!-- <th>Redeem</th> -->
<th>Discount Amount</th>
<th><%= t("views.right_panel.detail.discount_amount") %></th>
<!-- <th>Balance</th> -->
<th>From Account</th>
<th>Status</th>
<th>Receipt No</th>
<th><%= t("views.right_panel.detail.from_account") %></th>
<th><%= t("views.right_panel.detail.status") %></th>
<th><%= t("views.right_panel.detail.receipt_no") %></th>
</tr>
</thead>
<tbody>
@@ -97,16 +97,17 @@
<div class="tab-pane" id="order" role="tabpanel" style="min-height:670px; max-height:670px; ">
<h3>Order Details</h3>
<h3><%= t :order_details %></h3>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Order ID </th>
<th>Type</th>
<th>Order status</th>
<th>Order date</th>
<th>Items Count</th>
<th><%= t("views.right_panel.detail.order_id") %></th>
<th><%= t("views.right_panel.detail.type") %></th>
<th><%= t("views.right_panel.detail.type") %></th>
<th><%= t("views.right_panel.detail.order_status") %></th>
<th><%= t("views.right_panel.detail.order_date") %></th>
<th><%= t("views.right_panel.detail.items_count") %></th>
</tr>
</thead>
@@ -127,18 +128,18 @@
</div>
<div class="tab-pane" id="sale" role="tabpanel" style="min-height:670px; max-height:670px; ">
<h3>Sale Details</h3>
<h3><%= t :sale_details %></h3>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>Sale Id </th>
<th>Receipt no </th>
<th>Grand total</th>
<th>Tax amount</th>
<th>Cashier</th>
<th>Sales status</th>
<th>Receipt Date</th>
<th><%= t("views.right_panel.detail.sale_id") %></th>
<th><%= t("views.right_panel.detail.receipt_no") %></th>
<th><%= t("views.right_panel.detail.grand_total") %></th>
<th><%= t("views.right_panel.detail.tax_amount") %></th>
<th><%= t :cashier %></th>
<th><%= t("views.right_panel.detail.sales_status") %></th>
<th><%= t("views.right_panel.detail.receipt_date") %></th>
</tr>
</thead>
@@ -166,7 +167,7 @@
<div class="col-lg-1 col-md-1 col-sm-1">
<br><br>
<a href="<%= crm_customers_path%>" class="btn btn-primary btn-lg">
<i class="fa fa-arrow-left fa-lg"></i> Back
<i class="fa fa-arrow-left fa-lg"></i> <%= t("views.btn.back") %>
</a>
</div>

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

@@ -1,7 +1,7 @@
<div class="container-fluid">
<p id="notice"><%= notice %></p>
<h1>Inventory Definitions</h1>
<h1><%= t :inventory_definitions %></h1>
<table>
<thead>

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

@@ -1,7 +1,7 @@
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item"><a href="<%= inventory_path %>"><%= t("views.right_panel.detail.product") %> <%= t :inventory %></a></li>
<li class="breadcrumb-item"><a href="<%= inventory_path %>"><%= t :inventory %></a></li>
<li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), inventory_path %>

34
config/locales/en.yml
View File

@@ -59,6 +59,11 @@ en:
shift_started_at: "Shift Started At"
cashier_name: "Cashier Name"
closing_balance: "Closing Balance"
card_tap: "Card Tap"
customer_details: "Customer Details"
order_details: "Order Details"
sale_details: "Sale Details"
inventory_definitions: "Inventory Definitions"
views:
btn:
@@ -308,6 +313,35 @@ en:
level: "Level"
balance: "Balance"
set_stock_check_reason: "Set Stock Check Reason"
salutation: "Salutation"
mr: "Mr"
miss: "Miss"
mrs: "Mrs"
mdm: "Mdm"
gender: "Gender"
male: "Male"
female: "Female"
sr_no: "Sr.No"
date_of_birth: "Date Of Birth"
select_customer_type: "Select Customer Type"
paypar_account_no: "Paypar Account No"
select_membership_group: "Select Membership Group"
company: "Company"
nrc_passport_no: "NRC/Passport No"
address: "Address"
dob: "DOB"
membership_type: "Membership Type"
discount_amount: "Discount Amount"
from_account: "From Account"
receipt_no: "Receipt No"
order_id: "Order ID"
order_date: "Order date"
sale_id: "Sale ID"
receipt_no: "Receipt No"
grand_total: "Grand Total"
tax_amount: "Tax Amount"
sales_status: "Sales Status"
receipt_date: "Receipt Date"
code_txt: "code "
charge_txt: "charge"