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

update site bar and credit note view in transaction

Browse Source
This commit is contained in:
Aung Myo
2017-10-25 15:06:28 +06:30
parent c3f21445d8
commit fa5b544416
5 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/views/layouts/_left_sidebar.html.erb
View File

@@ -153,12 +153,8 @@
<span><%= t :printer %></span> <span><%= t :printer %></span>
</a> </a>
</li> </li>
<li>
<a href="<%= settings_products_path %>">
<i class="material-icons col-brown">donut_large</i>
<span><%= t :products %></span>
</a>
</li>
<li> <li>
<a href="<%= settings_tax_profiles_path %>"> <a href="<%= settings_tax_profiles_path %>">
<i class="material-icons col-green">donut_large</i> <i class="material-icons col-green">donut_large</i>
@@ -177,6 +173,30 @@
<span><%= t :accounts %></span> <span><%= t :accounts %></span>
</a> </a>
</li> </li>
<li>
<a href="<%= settings_products_path %>">
<i class="material-icons col-brown">donut_large</i>
<span><%= t :products %></span>
</a>
</li>
<li>
<a href="<%= settings_promotions_path %>">
<i class="material-icons col-red">donut_large</i>
<span><%= t :promotions %></span>
</a>
</li>
<li>
<a href="<%= settings_commissions_path %>">
<i class="material-icons col-green">donut_large</i>
<span><%= t :commissions %></span>
</a>
</li>
<li>
<a href="<%= settings_commissioners_path %>">
<i class="material-icons col-teal">donut_large</i>
<span><%= t :commissioners %></span>
</a>
</li>
</ul> </ul>
</div> </div>
<!-- #Menu --> <!-- #Menu -->

68
app/views/transactions/credit_notes/index.html.erb
View File

@@ -1,4 +1,4 @@
<div class="row"> <!-- <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="<%= crm_root_path %>">Home</a></li> <li><a href="<%= crm_root_path %>">Home</a></li>
@@ -8,44 +8,54 @@
</ol> </ol>
</div> </div>
</div> -->
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
<li class="breadcrumb-item active">Credit Note</li>
<span class="float-right">
<%= link_to 'Back', dashboard_path %>
</span>
</ol>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="main-box-body clearfix p-l-5 p-r-5"> <div class="main-box-body clearfix p-l-5 p-r-5">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-"> <table class="table table-">
<theadtbody> <tbody>
<tr> <tr>
<td colspan=""> <td colspan="">
<%= form_tag transactions_credit_notes_path, :method => :get do %> <%= form_tag transactions_credit_notes_path, :method => :get do %>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> <div class="row clearfix">
<label>Enter Keywords</label> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<input type="text" name="receipt_no" class="form-control" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px"> <label class="font-14">Enter Keywords</label>
</div> <input type="text" name="receipt_no" class="form-control m-t-3" placeholder="Receipt No/Cashier Name/Status" style="margin-right: 10px">
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> </div>
<label>Select Customer</label> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<select class="selectpicker form-control col-md-12" name="customer" style="height: 40px" > <label class="font-14">Select Customer</label>
<option value="">Select Customer</option> <select class="selectpicker form-control col-md-12 " name="customer" style="height: 40px" >
<% @customers.each do |customer| %> <option value="">Select Customer</option>
<option value="<%= customer.customer_id %>"> <% @customers.each do |customer| %>
<%= customer.name %></option> <option value="<%= customer.customer_id %>">
<%end %> <%= customer.name %></option>
</select> <%end %>
</div> </select>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> </div>
<label class="">From</label> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date"> <label class="font-14">From</label>
</div> <input class="form-control datepicker m-t-3" name="from" id="date" type="text" placeholder="From date">
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> </div>
<label class="">To</label> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date"> <label class="font-14">To</label>
</div> <input class="form-control datepicker m-t-3" name="to" id="date" type="text" placeholder="To date">
</div>
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
<label> &nbsp;</label> <label class="font-14"> &nbsp;</label><br>
<input type="submit" value="Search" class='btn btn-primary btn-md'> <input type="submit" value="Search" class='btn btn-primary btn-md'>
</div> </div>
</div>
<% end %> <% end %>
</td> </td>
</tr> </tr>

7
app/views/transactions/sales/show.html.erb
View File

@@ -36,9 +36,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr>
<td colspan="6">&nbsp;</td>
</tr>
<tr> <tr>
<th>Receipt Date </th> <th>Receipt Date </th>
<th>Receipt no</th> <th>Receipt no</th>
@@ -129,9 +127,6 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr>
<td colspan="8">&nbsp;</td>
</tr>
<tr> <tr>
<th>Order ID</th> <th>Order ID</th>
<th>Menu Item</th> <th>Menu Item</th>

2
config/locales/en.yml
View File

@@ -20,6 +20,8 @@ en:
staff: "Staff" staff: "Staff"
products: "Products" products: "Products"
promotions: "Promotions" promotions: "Promotions"
commissions: "Commissions"
commissioners: "Commissioners"
printer: "Printer" printer: "Printer"
logout: "Logout" logout: "Logout"
sale: "Sale" sale: "Sale"

2
config/locales/mm.yml
View File

@@ -20,6 +20,8 @@ mm:
staff: "၀န်ထမ်းများ" staff: "၀န်ထမ်းများ"
products: "ကုန်စည်များ" products: "ကုန်စည်များ"
promotions: "အရောင်းမြှင့်တင်ရေး" promotions: "အရောင်းမြှင့်တင်ရေး"
commissions: "ကော်မရှင်များ"
commissioners: "ကော်မရှင်များ"
printer: "ပရင့်တာ" printer: "ပရင့်တာ"
logout: "ထွက်ရန်" logout: "ထွက်ရန်"
sale: "အရောင်း" sale: "အရောင်း"