Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/dining_charges.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/dining_charges.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the dining_charges controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/origami/voucher_controller.rb

@@ -0,0 +1,72 @@
+class Origami::VoucherController < BaseOrigamiController
+
+  def index
+    @sale_id = params[:sale_id]
+
+    # limit voucher_amount
+    sale_data = Sale.find_by_sale_id(@sale_id)
+    total = sale_data.grand_total
+    @vouchercount = 0
+    others = 0
+    sale_data.sale_payments.each do |sale_payment|
+        if sale_payment.payment_method == "voucher"
+          @vouchercount = @vouchercount + sale_payment.payment_amount
+        else
+          others = others + sale_payment.payment_amount
+        end
+    end
+    @can_voucher = total - @vouchercount - others
+
+  end
+
+  def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    sale_id = params[:refnumber]
+    if(Sale.exists?(sale_id))
+      customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+      if customer_data
+        membership_id = customer_data.membership_id
+        membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+        if membership_setting.gateway_url
+          member_actions =MembershipAction.find_by_membership_type("get_account_balance") #need to modify here
+          if member_actions.gateway_url
+            campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
+            url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+            merchant_uid= member_actions.merchant_account_id
+            auth_token = member_actions.auth_token.to_s
+            # membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token)
+            # if membership_data["status"]==true
+              begin
+                response = HTTParty.get(url,
+                        :body => { app_token: token,membership_id:membership_id,
+                                  campaign_type_id:campaign_type_id,merchant_uid:merchant_uid,
+                                  auth_token:auth_token
+                                  }.to_json,
+                        :headers => {
+                                  'Content-Type' => 'application/json',
+                                  'Accept' => 'application/json'
+                        }, :timeout => 10
+                  )
+              rescue Net::OpenTimeout
+                  response = { status: false }
+
+              rescue OpenURI::HTTPError
+                response = { status: false}
+
+              rescue SocketError
+                response = { status: false}
+              end
+            # end
+          end
+        end
+      end
+      if( response["status"]==true )
+        saleObj = Sale.find(sale_id)
+        sale_payment = SalePayment.new
+        @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "voucher")
+      end
+    end
+  end
+
+end

app/controllers/settings/dining_charges_controller.rb

@@ -0,0 +1,91 @@
+class Settings::DiningChargesController < ApplicationController
+  before_action :set_dining_charge, only: [:show, :edit, :update, :destroy]
+  before_action :set_settings_facility
+  before_action :set_settings_zone
+  # GET /dining_charges
+  # GET /dining_charges.json
+  def index
+    @dining_charges = DiningCharge.all
+  end
+
+  # GET /dining_charges/1
+  # GET /dining_charges/1.json
+  def show
+  end
+
+  # GET /dining_charges/new
+  def new
+    @dining_charge = DiningCharge.new
+  end
+
+  # GET /dining_charges/1/edit
+  def edit
+  end
+
+  # POST /dining_charges
+  # POST /dining_charges.json
+  def create
+    @dining_charge = DiningCharge.new(dining_charge_params)
+    @dining_charge.dining_facility_id = @settings_dining_facility.id
+    respond_to do |format|
+      if @dining_charge.save
+        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully created.' }
+        format.json { render :show, status: :created, location: @dining_charge }
+      else
+        format.html { render :new }
+        format.json { render json: @dining_charge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /dining_charges/1
+  # PATCH/PUT /dining_charges/1.json
+  def update
+    respond_to do |format|
+      @dining_charge.dining_facility_id = @settings_dining_facility.id
+      if @dining_charge.update(dining_charge_params)
+        format.html { redirect_to edit_settings_zone_table_path(@zone,@settings_dining_facility), notice: 'Dining charge was successfully updated.' }
+        format.json { render :show, status: :ok, location: @dining_charge }
+      else
+        format.html { render :edit }
+        format.json { render json: @dining_charge.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /dining_charges/1
+  # DELETE /dining_charges/1.json
+  def destroy
+    @dining_charge.destroy
+    respond_to do |format|
+      format.html { redirect_to dining_charges_url, notice: 'Dining charge was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_dining_charge
+      @dining_charge = DiningCharge.find(params[:id])
+    end
+
+    def set_settings_facility
+      if params[:table_id]
+        @table = true
+        @settings_dining_facility = Table.find(params[:table_id])
+      elsif params[:room_id]
+        @room = true
+        @settings_dining_facility = Room.find(params[:room_id])
+      end
+    end
+
+    def set_settings_zone
+      @zone = Zone.find(params[:zone_id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def dining_charge_params
+      # params.fetch(:dining_charge, {})
+      params.require(:dining_charge).permit(:item_code, :unit_price, :taxable, :charge_type,:minimum_free_time ,:charge_block,:time_rounding,:time_rounding_block, :zone_id)
+    end
+end

app/helpers/dining_charges_helper.rb

@@ -0,0 +1,2 @@
+module DiningChargesHelper
+end

app/models/dining_charge.rb

@@ -0,0 +1,41 @@
+class DiningCharge < ApplicationRecord
+  belongs_to :table
+  belongs_to :room
+
+  def amount_calculate(dining_charges_obj, checkin , checkout)
+
+    if !checkin.nil? && !checkout.nil? && !dining_charges_obj.nil?
+
+      minutes = ((checkin - checkout) * 24 * 60).to_i # stay minutes
+      dining_minutes = minutes - dining_charges_obj.minimum_free_time # stayminutes - free minutes
+      charge_type = dining_charges_obj.charge_type
+      if charge_type == 'hr'
+
+      elsif charge_type == 'day'
+        price = charge_by_day
+      end
+    end
+
+  end
+
+  def charge_by_hour
+
+  end
+
+  def charge_by_day(chargesObj, dining_minutes)
+    minues_per_day =  12 * 60
+    result = dining_minutes / minues_per_day
+    if result < 1
+      return chargesObj.unit_price
+    elsif result > 1
+       solid_price = result * chargesObj.unit_price
+
+       remain_value = dining_minutes % minues_per_day
+       roundingblock = remain_value / chargesObj.time_rounding_block
+       if roundingblock > 1
+
+       end
+    end
+  end
+
+end

app/models/dining_facility.rb

@@ -1,5 +1,6 @@
 class DiningFacility < ApplicationRecord
   belongs_to :zone
+  has_many :dining_charges
 
   TABLE_TYPE = "Table"
   ROOM_TYPE = "Room"

app/views/home/dashboard.html.erb

@@ -1,12 +1,12 @@
-
-    <div class="row">
+  <div class="row">
         <div class="col-md-4 col-sm-6 col-md-offset-4 col-sm-offset-3">
-            
+
             <% if current_login_employee.role = "admin" %>
+
             <% elsif current_login_employee.role = "cashier" %>
             <%= link_to "Cashier Station", origami_path %>
 
-            <% elsif current_login_employee = "waiter" %>
+            <% elsif current_login_employee = "account" %>
             <%= link_to "Cashier Station", oishi_path %>
 
             <% else %>
@@ -18,18 +18,30 @@
             <!--  -->
 
 
-            <div class="card">
-              <div class="page-header" style="width:100%;text-align:center;background-color:#ddd;">
-               <h4 style="color : #ef404a;font-weight:bold;font-style:italic;"><%= shop.name %></h4>
-              </div>
-              <div class="card-block">
-              <%= shop.address %>
-              </div>
-              <div class="card-block">
-              <%= shop.phone_no %>
-              </div>
-
-            </div>
 
+      </div>
+</div>
+    <div class="footer">
+      <div class="card">
+        <div class="page-header" style="width:100%;text-align:center;background-color:#ddd;">
+         <h4 style="color : #ef404a;font-weight:bold;font-style:italic;margin-bottom:0px;"><%= shop.name %></h4>
         </div>
+        <div class="card-block" style="text-align:center;background-color:#ddd;padding:0rem;">
+        <%= shop.address %>
+        </div>
+        <div class="card-block"  style="text-align:center;background-color:#ddd;padding:0rem;">
+        <%= shop.phone_no %>
+        </div>
+
+      </div>
     </div>
+  <style type="text/css">
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    height: auto;
+    background-color: #ef404a;
+    width: 100%;
+  }
+  </style>

app/views/origami/voucher/create.json.jbuilder

@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end

app/views/origami/voucher/index.html.erb

@@ -0,0 +1,179 @@
+
+<div class="row">
+
+	<div class="col-lg-5 col-md-5 col-sm-3">
+		<div class="row">
+			<div class="col-md-6">
+				<h2>Voucher / Coupon</h2>
+			</div>
+		</div>
+			<div class="card" style="margin-top:10px;padding-top:20px;">
+				<div class="rebate-form">
+					<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">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_voucher %>" data-member-value="">
+						</div>
+						<hr>
+					</div>
+					<% if @vouchercount != 0 %>
+					<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 Voucher paid amount </label>
+									<input type="text" name="" id="" class="form-control col-lg-7 col-md-7 col-sm-7"  readonly="" value="<%=@vouchercount %>" data-member-value="">
+						</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">Reference Number</label>
+						      	<input type="text" name="valid_amount" id="<%=@sale_id %>" class="form-control col-lg-7 col-md-7 col-sm-7 float-value" 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> -->
+									<input type="text" name="" id="amount" class="form-control col-lg-7 col-md-7 col-sm-7 float-value" value="" data-value="amount" data-member-value="">
+			    		</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="col-lg-6 col-md-1 col-sm-1">
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="1" data-type="num">1</div>
+             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="4" data-type="num">4</div>
+             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="7" data-type="num">7</div>
+             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="0" data-type="num">0</div>
+             <div class=" cashier_number left" data-value="." data-type="num">.</div>
+             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number green" data-type="nett" >Nett</div>
+             <div class=" cashier_number red left" data-type="del">Del</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
+           </div>
+         </div>
+         <div class="col-lg-6 col-md-1 col-sm-1">
+           <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="3000" data-type="add">3000</div>
+           </div>
+           <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="10000" data-type="add">10000</div>
+           </div>
+           <div class="row bottom">
+             <div class="pay purple" id="voucher_pay">Pay</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/others_payment';"> Back </button>
+		</div>
+</div>
+
+<script>
+$(document).ready(function() {
+		if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+	  else {
+	    $('#validamount').attr("value",parseFloat("<%= @can_voucher %>") - parseFloat(localStorage.getItem("cash")));
+	  }
+});
+// number key pad
+var float_value = ""
+var total = 0
+
+$(document).on('focusout', '.float-value', function(event){
+ float_value = $(this).attr("data-value");
+$(document).on('click', '.cashier_number', function(event){
+        event.stopPropagation();
+        event.preventDefault();
+        if(event.handled !== true) {
+            var original_value;
+            original_value = $('#'+float_value).val();
+
+            var input_value = $(this).attr("data-value");
+
+            var input_type = $(this).attr("data-type");
+            	switch (input_type) {
+              		case 'num':
+		              	if (original_value == "0.0"){
+			                $('#'+float_value).val(input_value);
+			            }else{
+			                $('#'+float_value).val(original_value+input_value);
+			            }
+              		break;
+
+              		case 'add':
+	                	var input_value = $(this).attr("data-value");
+	                	amount = parseInt(input_value) + parseInt(original_value);
+	                	$('#'+float_value).val(amount);
+
+             		break;
+             		case 'clr':
+             			$('#'+float_value).val("0.0");
+             		break;
+             		case 'del' :
+			          var cash=$('#'+float_value).val();
+			          $('#'+float_value).val(cash.substr(0,cash.length-1));
+								break;
+								case 'nett':
+								var remain_amount = $('#validamount').val();
+								$('#'+float_value).val(remain_amount);
+			        break;
+
+          		}
+          	event.handled = true;
+        } else {
+            return false;
+        }
+});
+})
+
+
+  $('#voucher_pay').on('click',function(){
+    var amount = $('#amount').val();
+		var refnumber = $("#<%=@sale_id %>").val();
+    var sale_id = "<%= @sale_id %>";
+		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) ){
+			// alert(amount);
+			// alert(refnumber);
+	    $.ajax({type: "POST",
+	      url: "<%= origami_payment_voucher_path  %>",
+	      data: "amount="+ amount + "&sale_id="+ sale_id+ "&refnumber="+ refnumber,
+	      success:function(result){
+	        if(result){
+	          alert("Payment success")
+	          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+	       }
+	      }
+	    });
+		}else{
+			alert("Paid Amount is over!");
+		}
+  })
+</script>

app/views/settings/dining_charges/_dining_charge.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! dining_charge, :id, :created_at, :updated_at
+json.url dining_charge_url(dining_charge, format: :json)

app/views/settings/dining_charges/_form.html.erb

@@ -0,0 +1,18 @@
+<%= simple_form_for([:settings,@zone,@settings_dining_facility,@dining_charge]) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :item_code %>
+    <%= f.input :unit_price %>
+    <%= f.input :taxable %>
+    <%= f.input :charge_type %>
+    <%= f.input :minimum_free_time %>
+    <%= f.input :charge_block %>
+    <%= f.input :time_rounding %>
+    <%= f.input :time_rounding_block %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

app/views/settings/dining_charges/edit.html.erb

@@ -0,0 +1,19 @@
+<!-- <h1>Editing Dining Charge</h1>
+
+<%= render 'form', dining_charge: @dining_charge %>-->
+
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_zone_path(@zone) %>">Zone</a></li>
+        <% if @table %>
+  			   <li><a href="<%= edit_settings_zone_table_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
+        <% elsif @room %>
+  			   <li><a href="<%= edit_settings_zone_room_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
+        <% end %>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', dining_charge: @dining_charge %>
+</div>

app/views/settings/dining_charges/index.html.erb

@@ -0,0 +1,25 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Dining Charges</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @dining_charges.each do |dining_charge| %>
+      <tr>
+        <td><%= link_to 'Show', dining_charge %></td>
+        <td><%= link_to 'Edit', edit_dining_charge_path(dining_charge) %></td>
+        <td><%= link_to 'Destroy', dining_charge, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Dining Charge', new_dining_charge_path %>

app/views/settings/dining_charges/index.json.jbuilder

@@ -0,0 +1 @@
+json.array! @dining_charges, partial: 'dining_charges/dining_charge', as: :dining_charge

app/views/settings/dining_charges/new.html.erb

@@ -0,0 +1,18 @@
+<!-- <h1>New Dining Charge</h1>
+
+<%= render 'form', dining_charge: @dining_charge %> -->
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_zone_path(@zone) %>">Zone</a></li>
+        <% if @table %>
+  			   <li><a href="<%= edit_settings_zone_table_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
+        <% elsif @room %>
+  			   <li><a href="<%= edit_settings_zone_room_path(@zone,@settings_dining_facility) %>">Table / Room</a></li>
+        <% end %>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', dining_charge: @dining_charge %>
+</div>

app/views/settings/dining_charges/show.html.erb

@@ -0,0 +1,4 @@
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_dining_charge_path(@dining_charge) %> |
+<%= link_to 'Back', dining_charges_path %>

app/views/settings/dining_charges/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial! "dining_charges/dining_charge", dining_charge: @dining_charge

app/views/settings/employees/index.html.erb

@@ -16,6 +16,7 @@
         <th style="width:20%">Name</th>
         <th style="width:20%">Role</th>
         <th style="width:20%">Created At</th>
+        <th style="width:20%">Updated At</th>
         <th style="width:20%">Action</th>
       </tr>
     </thead>
@@ -26,6 +27,7 @@
           <td><%= link_to employee.name,settings_employee_path(employee)  %></td>
           <td><%= employee.role %></td>
           <td><%= employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          <td><%= employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
             <%= link_to 'Edit', edit_settings_employee_path(employee) %>
            <%if employee.role != "administrator"%>

app/views/settings/employees/show.html.erb

@@ -2,7 +2,7 @@
  <ul class="breadcrumb">
   <li><a href="<%= root_path %>">Home</a></li>
   <li><a href="<%= settings_employees_path %>">Employee</a></li>
-  
+
   <span style="float: right">
   </span>
  </ul>
@@ -15,7 +15,8 @@
         <tr>
           <th>Name</th>
           <th>Role</th>
-          
+          <th>Created At</th>
+          <th>Updated At</th>
           <th>Action</th>
         </tr>
       </thead>
@@ -24,6 +25,8 @@
         <tr>
           <td><%= @employee.name %></td>
           <td><%= @employee.role %></td>
+          <td><%= @employee.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
+          <td><%= @employee.updated_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <td>
               <%= link_to 'Edit', edit_settings_employee_path(@employee) %>
           </td>
@@ -34,4 +37,3 @@
 </div>
 
 </div>
-

app/views/settings/tables/_form.html.erb

@@ -7,6 +7,26 @@
     <%= f.input :seater %>
     <%= f.input :order_by %>
     <%= f.input :is_active %>
+    <% if @settings_table.dining_charges.length == 0 %>
+    <div class="div-border">
+          <div class="col-md-10">
+              <%= link_to 'Add For Extra Charges', new_settings_zone_table_dining_charge_path(@zone,@settings_table),:class => 'btn btn-primary' %>
+          </div>
+    </div>
+    <% else %>
+      <%  @settings_table.dining_charges.each do |dc| %>
+      <div class="div-border">
+            <div class="col-md-10"><b><u>Dining Charge</u></b></div>
+            <div class="col-md-10">item code   :  <%= dc.item_code %></div>
+            <div class="col-md-10">Unit price  :  <%= dc.unit_price %></div>
+            <div class="col-md-10">Charge type :  <%= dc.charge_type %></div>
+            <div class="col-md-10">
+              <%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn btn-primary' %>
+              <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> -->
+            </div>
+      </div>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="form-actions">