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

Update

Browse Source
This commit is contained in:
Nweni
2017-06-17 11:35:17 +06:30
parent 49768900a9
commit 29b76adba7
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/controllers/origami/home_controller.rb
View File

@@ -1,8 +1,8 @@
class Origami::HomeController < BaseOrigamiController class Origami::HomeController < BaseOrigamiController
def index def index
if params[:booking_id] != nil if params[:booking_id] != nil
type=params[:booking_id].split('-')[0]; type=params[:booking_id].split('-')[0];
# Sale # Sale
if type == "SAL" if type == "SAL"
@selected_item = Sale.find(params[:booking_id]) @selected_item = Sale.find(params[:booking_id])
@selected_item_type="Sale" @selected_item_type="Sale"
@@ -10,23 +10,23 @@ class Origami::HomeController < BaseOrigamiController
else else
@selected_item = Order.find(params[:booking_id]) @selected_item = Order.find(params[:booking_id])
@selected_item_type="Order" @selected_item_type="Order"
end end
end end
@completed_orders = Order.get_completed_order() @completed_orders = Order.get_completed_order()
@booking_orders = Order.get_booking_order_table() @booking_orders = Order.get_booking_order_table()
@booking_rooms = Order.get_booking_order_rooms() @booking_rooms = Order.get_booking_order_rooms()
@orders = Order.get_orders() @orders = Order.get_orders()
end end
def item_show def item_show
selection(params[:booking_id],1) selection(params[:booking_id],1)
end end
def selection(selected_id, is_ajax) def selection(selected_id, is_ajax)
str = [] str = []
type=selected_id.split('-')[0]; type=selected_id.split('-')[0];
# Sale # Sale
if type == "SAL" if type == "SAL"
@order_details = SaleItem.get_order_items_details(params[:booking_id]) @order_details = SaleItem.get_order_items_details(params[:booking_id])
@order_details.each do |ord_detail| @order_details.each do |ord_detail|
@@ -37,8 +37,8 @@ class Origami::HomeController < BaseOrigamiController
@order_details = OrderItem.get_order_items_details(params[:booking_id]) @order_details = OrderItem.get_order_items_details(params[:booking_id])
@order_details.each do |ord_detail| @order_details.each do |ord_detail|
str.push(ord_detail) str.push(ord_detail)
end end
end end
if is_ajax == 1 if is_ajax == 1
render :json => str.to_json render :json => str.to_json
else else
@@ -54,21 +54,21 @@ class Origami::HomeController < BaseOrigamiController
else else
sale = Order.find(params[:sale_id]) sale = Order.find(params[:sale_id])
end end
status = sale.update_attributes(customer_id: params[:customer_id]) status = sale.update_attributes(customer_id: params[:customer_id])
if status == true if status == true
render json: JSON.generate({:status => true}) render json: JSON.generate({:status => true})
else else
render json: JSON.generate({:status => false, :error_message => "Record not found"}) render json: JSON.generate({:status => false, :error_message => "Record not found"})
end end
end end
def get_customer def get_customer
@customer = Customer.find(params[:customer_id]) @customer = Customer.find(params[:customer_id])
response = Customer.get_member_account(@customer) response = Customer.get_member_account(@customer)
respond_to do |format| respond_to do |format|

4
app/models/order.rb
View File

@@ -231,7 +231,7 @@ class Order < ApplicationRecord
.joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join orders on orders.order_id = booking_orders.order_id")
.joins("left join sales on sales.sale_id = bookings.sale_id") .joins("left join sales on sales.sale_id = bookings.sale_id")
.where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true) .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
.group("bookings.booking_id") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
# For PG # For PG
# booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
# sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -262,7 +262,7 @@ class Order < ApplicationRecord
.joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join orders on orders.order_id = booking_orders.order_id")
.joins("left join sales on sales.sale_id = bookings.sale_id") .joins("left join sales on sales.sale_id = bookings.sale_id")
.where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true) .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
.group("bookings.booking_id") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
# For PG # For PG
# booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
# sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id

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

@@ -354,14 +354,14 @@
<td class="charges-name"><strong>Discount:</strong></td> <td class="charges-name"><strong>Discount:</strong></td>
<td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td> <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
</tr> </tr>
<tr> <tr>
<td class="charges-name"><strong>Tax:</strong></td> <td class="charges-name"><strong>Tax:</strong></td>
<td class="item-attr"><strong id="order-Tax"><%=@selected_item.total_tax rescue 0%></strong></td> <td class="item-attr"><strong id="order-Tax"><%=@selected_item.total_tax rescue 0%></strong></td>
</tr> </tr>
<tr> <tr>
<td class="charges-name"><strong>Grand Total:</strong></td> <td class="charges-name"><strong>Grand Total:</strong></td>
<td class="item-attr"><strong id="order-grand-total"><%=@selected_item.grand_total rescue 0%></strong></td> <td class="item-attr"><strong id="order-grand-total"><%=@selected_item.grand_total rescue 0%></strong></td>
</tr> </tr>
<tr class="rebate_amount"> <tr class="rebate_amount">
</tr> </tr>

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

@@ -21,7 +21,7 @@
<% end %> <% end %>
<div class="row"> <div class="row">
<div class="form-group col-lg-12 col-md-12 col-sm-12"> <div class="form-group col-lg-12 col-md-12 col-sm-12">
<label class="col-lg-4 col-md-4 col-sm-4">Available Redeem Amount</label> <label class="col-lg-4 col-md-4 col-sm-4"> Rebat Balance </label>
<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>"> <input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
</div> </div>
<hr> <hr>
@@ -66,7 +66,7 @@
<div class=" cashier_number left" data-value="00" data-type="num">00</div> <div class=" cashier_number left" data-value="00" data-type="num">00</div>
</div> </div>
<div class="row bottom"> <div class="row bottom">
<div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div> <div class=" cashier_number " data-type="nett">Nett</div>
<div class=" cashier_number red left" data-type="del">Del</div> <div class=" cashier_number red left" data-type="del">Del</div>
<div class=" cashier_number green left" data-type="clr">Clr</div> <div class=" cashier_number green left" data-type="clr">Clr</div>
</div> </div>
@@ -123,6 +123,9 @@ $(document).on('click', '.cashier_number', function(event){
case 'del' : case 'del' :
var cash=$('#used_amount').text(); var cash=$('#used_amount').text();
$('#used_amount').text(cash.substr(0,cash.length-1)); $('#used_amount').text(cash.substr(0,cash.length-1));
case 'nett':
alert($('#valid_amount').text())
$('#used_amount').text($('#valid_amount').text());
break; break;
} }