From 8c47371fa7a1af392a470a4f971f51f8518d4ef8 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Tue, 6 Jun 2017 12:04:56 +0630 Subject: [PATCH 01/71] seed generator --- Gemfile.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5dce67dc..e2c1dd73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,6 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -253,7 +252,6 @@ DEPENDENCIES kaminari! listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) From 35277ac0005199730c9f0b7c2c3ab4fe2ffd1546 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Jun 2017 09:29:25 +0630 Subject: [PATCH 02/71] queue and crm view updated --- Gemfile | 3 +- Gemfile.lock | 4 +- .../javascripts/crm/dining_queues.coffee | 3 + app/assets/stylesheets/CRM.scss | 2 + app/controllers/api/customers_controller.rb | 5 + app/controllers/crm/customers_controller.rb | 19 +- .../crm/dining_queues_controller.rb | 74 ++++++ app/controllers/crm/home_controller.rb | 6 +- app/helpers/crm/dining_queues_helper.rb | 2 + app/models/crm.rb | 5 + app/models/customer.rb | 11 +- app/models/dining_queue.rb | 3 + .../get_customer_order.json.jbuilder | 38 +++ app/views/crm/customers/_form.html.erb | 10 +- app/views/crm/customers/index.html.erb | 26 +- .../_crm_dining_queue.json.jbuilder | 2 + app/views/crm/dining_queues/_form.html.erb | 16 ++ app/views/crm/dining_queues/edit.html.erb | 11 + app/views/crm/dining_queues/index.html.erb | 38 +++ .../crm/dining_queues/index.json.jbuilder | 1 + app/views/crm/dining_queues/new.html.erb | 11 + app/views/crm/dining_queues/show.html.erb | 19 ++ .../crm/dining_queues/show.json.jbuilder | 1 + app/views/crm/home/_booking.html.erb | 228 ++++++++++++------ app/views/crm/home/_customer.html.erb | 2 +- app/views/crm/home/_queue.html.erb | 30 +-- app/views/crm/home/index.html.erb | 40 ++- config/initializers/kaminari_config.rb | 10 + config/locales/en.yml | 38 ++- config/routes.rb | 5 +- ...20170608105644_create_crm_dining_queues.rb | 12 + .../crm/bookings_controller_spec.rb | 5 - .../crm/customers_controller_spec.rb | 159 ------------ spec/helpers/crm/dining_queues_helper_spec.rb | 15 ++ spec/requests/crm/crm_dining_queues_spec.rb | 10 + .../routing/crm/dining_queues_routing_spec.rb | 39 +++ .../crm/dining_queues/edit.html.erb_spec.rb | 24 ++ .../crm/dining_queues/index.html.erb_spec.rb | 25 ++ .../crm/dining_queues/new.html.erb_spec.rb | 24 ++ .../crm/dining_queues/show.html.erb_spec.rb | 18 ++ test/system/dining_queues_test.rb | 9 + 41 files changed, 685 insertions(+), 318 deletions(-) create mode 100644 app/assets/javascripts/crm/dining_queues.coffee create mode 100644 app/controllers/crm/dining_queues_controller.rb create mode 100644 app/helpers/crm/dining_queues_helper.rb create mode 100644 app/models/crm.rb create mode 100644 app/models/dining_queue.rb create mode 100644 app/views/api/customers/get_customer_order.json.jbuilder create mode 100644 app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder create mode 100644 app/views/crm/dining_queues/_form.html.erb create mode 100644 app/views/crm/dining_queues/edit.html.erb create mode 100644 app/views/crm/dining_queues/index.html.erb create mode 100644 app/views/crm/dining_queues/index.json.jbuilder create mode 100644 app/views/crm/dining_queues/new.html.erb create mode 100644 app/views/crm/dining_queues/show.html.erb create mode 100644 app/views/crm/dining_queues/show.json.jbuilder create mode 100644 config/initializers/kaminari_config.rb create mode 100644 db/migrate/20170608105644_create_crm_dining_queues.rb delete mode 100644 spec/controllers/crm/bookings_controller_spec.rb delete mode 100644 spec/controllers/crm/customers_controller_spec.rb create mode 100644 spec/helpers/crm/dining_queues_helper_spec.rb create mode 100644 spec/requests/crm/crm_dining_queues_spec.rb create mode 100644 spec/routing/crm/dining_queues_routing_spec.rb create mode 100644 spec/views/crm/dining_queues/edit.html.erb_spec.rb create mode 100644 spec/views/crm/dining_queues/index.html.erb_spec.rb create mode 100644 spec/views/crm/dining_queues/new.html.erb_spec.rb create mode 100644 spec/views/crm/dining_queues/show.html.erb_spec.rb create mode 100644 test/system/dining_queues_test.rb diff --git a/Gemfile b/Gemfile index 551503f9..1487492d 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,8 @@ gem 'sidekiq' # Pagination gem 'kaminari', '~> 0.16.3' - +# Datatable +gem 'filterrific' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index 93c2a58f..e7deca12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -72,6 +72,7 @@ GEM faker (1.7.3) i18n (~> 0.5) ffi (1.9.18) + filterrific (2.1.2) font-awesome-rails (4.7.0.2) railties (>= 3.2, < 5.2) globalid (0.4.0) @@ -109,7 +110,6 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -238,6 +238,7 @@ DEPENDENCIES database_cleaner factory_girl_rails (~> 4.0) faker + filterrific font-awesome-rails httparty (~> 0.15.5) jbuilder (~> 2.5) @@ -245,7 +246,6 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/assets/javascripts/crm/dining_queues.coffee b/app/assets/javascripts/crm/dining_queues.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/crm/dining_queues.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/ diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index b0f802f1..f43cc3f9 100644 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -7,3 +7,5 @@ // min-height: 75rem; // padding-top: 4.5rem; // } + + diff --git a/app/controllers/api/customers_controller.rb b/app/controllers/api/customers_controller.rb index 8ce2041c..2adc7c8a 100644 --- a/app/controllers/api/customers_controller.rb +++ b/app/controllers/api/customers_controller.rb @@ -9,4 +9,9 @@ class Api::CustomersController < ActionController::API def show @customer = Customer.find_by(params[:id]) end + + #Show customer detail by Order item + def get_customer_order + @customer = Customer.find(params[:id]) + end end diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 295a0d8f..fff260e2 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -5,12 +5,21 @@ class Crm::CustomersController < ApplicationController # GET /crm/customers.json def index @sale_id = 0 - @crm_customers = Customer.all - @crm_customer = Customer.new - @membership = Customer.get_member_group - if @membership["status"] == true - @member_group = @membership["data"] + filter = params[:filter] + + if filter.nil? + @crm_custome = Customer.order("name").page(params[:page]) + #@products = Product.order("name").page(params[:page]).per(5) + else + @crm_custome = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) end + @crm_customers = Kaminari.paginate_array(@crm_custome).page(params[:page]).per(5) + #@crm_customers = Customer.all + @crm_customer = Customer.new + # @membership = Customer.get_member_group + # if @membership["status"] == true + # @member_group = @membership["data"] + # end respond_to do |format| format.html # index.html.erb format.json { render json: @crm_customers } diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb new file mode 100644 index 00000000..235703d2 --- /dev/null +++ b/app/controllers/crm/dining_queues_controller.rb @@ -0,0 +1,74 @@ +class Crm::DiningQueuesController < ApplicationController + before_action :set_dining_queue, only: [:show, :edit, :update, :destroy] + + # GET /crm/dining_queues + # GET /crm/dining_queues.json + def index + @dining_queues = DiningQueue.all + end + + # GET /crm/dining_queues/1 + # GET /crm/dining_queues/1.json + def show + end + + # GET /crm/dining_queues/new + def new + @dining_queue = DiningQueue.new + end + + # GET /crm/dining_queues/1/edit + def edit + end + + # POST /crm/dining_queues + # POST /crm/dining_queues.json + def create + @dining_queue = DiningQueue.new(dining_queue_params) + + respond_to do |format| + if @dining_queue.save + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully created.' } + format.json { render :show, status: :created, location: @dining_queue } + else + format.html { render :new } + format.json { render json: @dining_queue.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /crm/dining_queues/1 + # PATCH/PUT /crm/dining_queues/1.json + def update + respond_to do |format| + if @dining_queue.update(dining_queue_params) + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully updated.' } + format.json { render :show, status: :ok, location: @dining_queue } + else + format.html { render :edit } + format.json { render json: @dining_queue.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /crm/dining_queues/1 + # DELETE /crm/dining_queues/1.json + def destroy + @dining_queue.destroy + respond_to do |format| + format.html { redirect_to crm_dining_queues_path, notice: 'Dining queue was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_dining_queue + @dining_queue = DiningQueue.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def dining_queue_params + params.require(:dining_queue).permit(:name, :contact_no, :queue_no) + end +end diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index 9ae2b413..c8d919e5 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -1,8 +1,12 @@ class Crm::HomeController < BaseCrmController def index - @booking = Booking.all + @booking = Booking.all @customer = Customer.all + from = Time.now.beginning_of_day.utc + to = Time.now.end_of_day.utc + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to) + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end diff --git a/app/helpers/crm/dining_queues_helper.rb b/app/helpers/crm/dining_queues_helper.rb new file mode 100644 index 00000000..af60bd52 --- /dev/null +++ b/app/helpers/crm/dining_queues_helper.rb @@ -0,0 +1,2 @@ +module Crm::DiningQueuesHelper +end diff --git a/app/models/crm.rb b/app/models/crm.rb new file mode 100644 index 00000000..3407e215 --- /dev/null +++ b/app/models/crm.rb @@ -0,0 +1,5 @@ +module Crm + def self.table_name_prefix + 'crm_' + end +end diff --git a/app/models/customer.rb b/app/models/customer.rb index 6d2bd561..b0667206 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -9,7 +9,8 @@ class Customer < ApplicationRecord validates_presence_of :name, :contact_no, :email validates :contact_no, uniqueness: true validates :email, uniqueness: true - + + paginates_per 50 def self.get_member_group @@ -30,6 +31,14 @@ class Customer < ApplicationRecord end + def self.search(search) + if search + find(:all, :conditions => ['name LIKE ?', "%#{search}%"]) + else + find(:all) + end + end + def lastest_invoices sales.where(:customer_id => self.id).order("created_at desc").limit(5) end diff --git a/app/models/dining_queue.rb b/app/models/dining_queue.rb new file mode 100644 index 00000000..dfcc5b43 --- /dev/null +++ b/app/models/dining_queue.rb @@ -0,0 +1,3 @@ +class DiningQueue < ApplicationRecord + +end diff --git a/app/views/api/customers/get_customer_order.json.jbuilder b/app/views/api/customers/get_customer_order.json.jbuilder new file mode 100644 index 00000000..f00ce173 --- /dev/null +++ b/app/views/api/customers/get_customer_order.json.jbuilder @@ -0,0 +1,38 @@ +if (@customer) + json.id @customer.customer_id + json.name @customer.name + json.email @customer.email + json.contact_no @customer.contact_no + json.date_of_birth @customer.date_of_birth + + + @total_amount = 0.00 + @total_tax = 0.00 + + if @customer.orders + order_items = [] + @customer.orders.each do |bo| + order = Order.find(bo.order_id) + #if (order.status == "new") + order_items = order_items + order.order_items + #end + end + + json.order_items order_items do |item| + json.item_instance_code item.item_code + json.item_name item.item_name + json.price item.price + json.qty item.qty + json.options item.options + json.remark item.remark + json.item_status item.order_item_status + @total_amount = @total_amount + (item.price * item.qty) + end + + end + + json.sub_total @total_amount + json.commerical_tax @total_amount * 0.05 + json.total @total_amount + (@total_amount * 0.05) + +end \ No newline at end of file diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb index 758a52a2..9e1046c3 100644 --- a/app/views/crm/customers/_form.html.erb +++ b/app/views/crm/customers/_form.html.erb @@ -16,5 +16,13 @@ <%= f.button :submit %> <% end %> - + \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 86f267b0..786a9f42 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -11,7 +11,7 @@ -
+
@@ -21,6 +21,17 @@ + + + + @@ -48,6 +59,9 @@ <% end %>
+ <%= form_tag crm_customers_path, :method => :get do %> +
+ + +
+ <% end %> +
Select Name
+
+

asdfj;l

+ <%= paginate @crm_customers %>
@@ -81,15 +95,7 @@ <%= f.text_field :date_of_birth,:class=>"form-control datepicker date_of_birth",:readonly =>true, :value => @date_of_birth%> -
- -
+
diff --git a/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder b/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder new file mode 100644 index 00000000..f2580e52 --- /dev/null +++ b/app/views/crm/dining_queues/_crm_dining_queue.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! crm_dining_queue, :id, :name, :contact, :queue_no, :created_at, :updated_at +json.url crm_dining_queue_url(crm_dining_queue, format: :json) diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb new file mode 100644 index 00000000..a99f6b76 --- /dev/null +++ b/app/views/crm/dining_queues/_form.html.erb @@ -0,0 +1,16 @@ + +<%= simple_form_for([:crm,@dining_queue]) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :name %> + <%= f.input :contact_no %> + <%= f.input :queue_no %> + +
+ +
+ <%= f.button :submit %> +
+<% end %> + diff --git a/app/views/crm/dining_queues/edit.html.erb b/app/views/crm/dining_queues/edit.html.erb new file mode 100644 index 00000000..e5ca3b9f --- /dev/null +++ b/app/views/crm/dining_queues/edit.html.erb @@ -0,0 +1,11 @@ + +
+
+ +
+ <%= render 'form', dining_queue: @dining_queue %> +
diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb new file mode 100644 index 00000000..e7834b98 --- /dev/null +++ b/app/views/crm/dining_queues/index.html.erb @@ -0,0 +1,38 @@ + + +
+
    +
  • Home
    • +
  • Queue
    • + + <%= link_to t('.new', :default => t("helpers.links.new")),new_crm_dining_queue_path,:class => 'btn btn-primary btn-sm' %> + +
+
+ +
+
+ + + + + + + + + + + + <% @dining_queues.each do |dining_queue| %> + + + + + + + <% end %> + +
NameContact NoQueue NoAction
<%= dining_queue.name %><%= dining_queue.contact_no %><%= dining_queue.queue_no %> + <%= link_to 'Edit', edit_crm_dining_queue_path(dining_queue) %> | <%= link_to 'Destroy', crm_dining_queue_path(dining_queue), method: :delete, data: { confirm: 'Are you sure?' } %>
+
+ diff --git a/app/views/crm/dining_queues/index.json.jbuilder b/app/views/crm/dining_queues/index.json.jbuilder new file mode 100644 index 00000000..979087b7 --- /dev/null +++ b/app/views/crm/dining_queues/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @crm_dining_queues, partial: 'crm_dining_queues/crm_dining_queue', as: :crm_dining_queue diff --git a/app/views/crm/dining_queues/new.html.erb b/app/views/crm/dining_queues/new.html.erb new file mode 100644 index 00000000..280a59b2 --- /dev/null +++ b/app/views/crm/dining_queues/new.html.erb @@ -0,0 +1,11 @@ + +
+
+ +
+ <%= render 'form', dining_queue: @dining_queue %> +
\ No newline at end of file diff --git a/app/views/crm/dining_queues/show.html.erb b/app/views/crm/dining_queues/show.html.erb new file mode 100644 index 00000000..5e52a611 --- /dev/null +++ b/app/views/crm/dining_queues/show.html.erb @@ -0,0 +1,19 @@ +

<%= notice %>

+ +

+ Name: + <%= @crm_dining_queue.name %> +

+ +

+ Contact: + <%= @crm_dining_queue.contact %> +

+ +

+ Queue no: + <%= @crm_dining_queue.queue_no %> +

+ +<%= link_to 'Edit', edit_crm_dining_queue_path(@crm_dining_queue) %> | +<%= link_to 'Back', crm_dining_queues_path %> diff --git a/app/views/crm/dining_queues/show.json.jbuilder b/app/views/crm/dining_queues/show.json.jbuilder new file mode 100644 index 00000000..83c09bea --- /dev/null +++ b/app/views/crm/dining_queues/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "crm_dining_queues/crm_dining_queue", crm_dining_queue: @crm_dining_queue diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index 3a2a7684..b9cf7296 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -6,29 +6,29 @@ <% @booking.each do |booking| %> <% if booking.booking_status == "new" %>
-
- -

- <%= @i += 1 %> . <%= booking.dining_facility.name %> - - <%= booking.id %> -

- -

- - Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> - -

-
-
-
-
- +
+ +

+ <%= @i += 1 %> . <%= booking.dining_facility.name %> + - <%= booking.id %> +

+ +

+ + Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> + +

-
- +
+
+
+ +
+
+ +
+
-
-
<% end %> <% end %> @@ -38,67 +38,95 @@ $(function(){ $(".booking_click").on("click", function(){ - $(".summary-items tbody tr").remove(); - $("#cancel").removeAttr("disabled"); - $("#assign").removeAttr("disabled"); - - var booking_id = $(this).find(".booking-id").text(); - $("#crm_print").val(booking_id); - $("#crm_print").removeAttr("disabled"); + $(this).css('background-color', '#CCC'); + $(".summary-items tbody tr").remove(); + $("#cancel").removeAttr("disabled"); + $("#assign").removeAttr("disabled"); - var url = $(this).attr('data-ref'); - show_details(url); + var booking_id = $(this).find(".booking-id").text(); + $("#crm_print").val(booking_id); + $("#crm_print").removeAttr("disabled"); - }); + var url = $(this).attr('data-ref'); + show_details(url); + + }); //End Booking Click + + $('.nav-link').click(function () { + var href = $(this).attr('href'); + if(href== "#customer" || href == "#queue"){ + $("#cancel").attr("disabled","disabled"); + $("#assign").attr("disabled","disabled"); + } + }); + //End nav-liik $('.crm_print').click(function() { - var booking_id = $('#crm_print').val(); + var booking_id = $('#crm_print').val(); - $.ajax({ - type: "GET", - url: "crm/print/"+booking_id, - data: {}, - dataType: "json", - success: function(data) { - - } - }); + $.ajax({ + type: "GET", + url: "crm/print/"+booking_id, + data: {}, + dataType: "json", + success: function(data) { + + } + }); }); + //End Print Click $('.assign').click(function(e){ - var booking_id = $(this).val() - var type = $(this).attr("data-type") + var booking_id = $(this).val() + var type = $(this).attr("data-type") - update_booking(booking_id,type) + update_booking(booking_id,type) }); + //End Assing Click $('.cancel').click(function(e){ - var booking_id = $(this).val() - var type = $(this).attr("data-type") + var booking_id = $(this).val() + var type = $(this).attr("data-type") - update_booking(booking_id,type) + update_booking(booking_id,type) }); + //End cancle Click + + + $(".customer_detail").on("click", function(){ + $(this).css('background-color', '#CCC'); + $(".summary-items tbody tr").remove(); + $("#crm_print").removeAttr("disabled"); + var id = $(this).attr('data-ref'); + $('.customer_detail').removeClass('selected-item'); + $(this).addClass('selected-item'); + customer_details(id); + + }); + //end customer click }); function show_details(url_item){ + //Start Ajax $.ajax({ - type: "GET", - url: url_item, - data: {}, - dataType: "json", - success: function(data) { - item_data = data.order_items; + type: "GET", + url: url_item, + data: {}, + dataType: "json", + success: function(data) { + item_data = data.order_items; //console.log(item_data.length); - + $("#table").text(data.table_name) $("#order_at").text(data.checkin_at) $("#order_by").text(data.checkin_by) $("#assign").val(data.id) $("#cancel").val(data.id) + for(var field in item_data) { - if (item_data[field].item_name){ + if (item_data[field].item_name){ var price = parseFloat(item_data[field].price).toFixed(2); row = "" @@ -106,32 +134,80 @@ function show_details(url_item){ +'' + item_data[field].qty + '' +'' + price + '' +''; - } - $(".summary-items tbody").append(row); + } + $(".summary-items tbody").append(row); } - - - - } + } }); + //end Ajax + $('.booking_click').removeClass('selected-item'); + $(this).addClass('selected-item'); +} + +function customer_details(id){ + //Start Ajax + $.ajax({ + type: "GET", + url: "api/customers/get_order/"+id, + data: {}, + dataType: "json", + success: function(data) { + item_data = data.order_items; + + $("#for-booking").remove(); + var div_data = "CUSTOMER DETAILS"; + $("#order-title").replaceWith(div_data); + + $('.customer-detail').removeClass('hide') ; + + $("#cus_name").text(data.name) + $("#cus_email").text(data.email) + $("#cus_contact_no").text(data.contact_no) + + if(item_data.length>0){ + for(var field in item_data) { + if (item_data[field].item_name){ + var price = parseFloat(item_data[field].price).toFixed(2); + + row = "" + +'' + item_data[field].item_name +'' + +'' + item_data[field].qty + '' + +'' + price + '' + +''; + } + $(".summary-items tbody").append(row); + } + }else{ + + } + } + }); + //End Ajax } function update_booking(booking_id,type) { + //Start Ajax $.ajax({ - type: "POST", - url: "update_booking/" , - data: {booking_id:booking_id,type:type}, - dataType: "json", - success: function(data) { - if(data.status == true && data.type == "cancel") - { - alert('Booking has canceled!'); - }else{ - alert('Booking has completed!'); - } - location.reload(); - } - }); + type: "POST", + url: "update_booking/" , + data: {booking_id:booking_id,type:type}, + dataType: "json", + success: function(data) { + if(data.status == true && data.type == "cancel") + { + alert('Booking has canceled!'); + }else{ + alert('Booking has completed!'); + } + location.reload(); + } + });//End Ajax } - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/views/crm/home/_customer.html.erb b/app/views/crm/home/_customer.html.erb index ea643494..4b32d5b4 100644 --- a/app/views/crm/home/_customer.html.erb +++ b/app/views/crm/home/_customer.html.erb @@ -1,7 +1,7 @@
<% @customer.each do |customer| %> -
+

Name : <%= customer.name %>

diff --git a/app/views/crm/home/_queue.html.erb b/app/views/crm/home/_queue.html.erb index d0851298..81cdd825 100644 --- a/app/views/crm/home/_queue.html.erb +++ b/app/views/crm/home/_queue.html.erb @@ -1,33 +1,21 @@
<% @i = 0 %> - <% @booking.each do |booking| %> - <% if booking.booking_status == "assign" %> -
-
- + <% @queue.each do |queue| %> + +
+

- <%= @i += 1 %> . <%= booking.dining_facility.name %> - - <%= booking.id %> + <%= @i += 1 %> . <%= queue.name %>

+

- - Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %> - + Contact No - <%= queue.contact_no %>

- +
- <% end %> + <% end %>
\ No newline at end of file diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index ef9b4684..787b2e39 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -5,32 +5,32 @@
-
+
<%= render :partial => 'queue' %>
-
+
<%= render :partial => 'booking' %>
-
+
<%= render :partial => 'customer' %>
@@ -47,12 +47,12 @@
- +
- + @@ -67,17 +67,35 @@
Order ByOrder At - Customer + Order AtCustomer
+ + + + + + + + + + + + + + + +
Name
Email
Contact No
-
Items QtyPrice + Price
+ +
@@ -102,5 +120,3 @@ - - diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb new file mode 100644 index 00000000..b1d87b01 --- /dev/null +++ b/config/initializers/kaminari_config.rb @@ -0,0 +1,10 @@ +Kaminari.configure do |config| + # config.default_per_page = 25 + # config.max_per_page = nil + # config.window = 4 + # config.outer_window = 0 + # config.left = 0 + # config.right = 0 + # config.page_method_name = :page + # config.param_name = :page +end diff --git a/config/locales/en.yml b/config/locales/en.yml index 06539571..ced8af0a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,23 +1,17 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - en: - hello: "Hello world" + views: + pagination: + first: "« First" + last: "Last »" + previous: "‹ Prev" + next: "Next ›" + truncate: "…" + helpers: + page_entries_info: + one_page: + display_entries: + zero: "No %{entry_name} found" + one: "Displaying 1 %{entry_name}" + other: "Displaying all %{count} %{entry_name}" + more_pages: + display_entries: "Displaying %{entry_name} %{first} - %{last} of %{total} in total" diff --git a/config/routes.rb b/config/routes.rb index b71faf7c..e2e58781 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -48,7 +48,9 @@ Rails.application.routes.draw do #Current active bookings resources :bookings, only: [:index, :show, :create, :update] - resources :customers, only: [:index, :show, :create, :update] + resources :customers + #get customer details by order items + get "customers/get_order/:id" => "customers#get_customer_order" #Generating Invoice and making payments - output render @sale resources :invoices, only: [:index, :show, :create, :update, :destroy ] do @@ -95,6 +97,7 @@ Rails.application.routes.draw do root "home#index" #queue number get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm resources :customers + resources :dining_queues post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel post "update_sale" , to: "home#update_sale_by_customer"#update customer id in sale table get '/print/:id', to: "home#print_order"#print order for crm diff --git a/db/migrate/20170608105644_create_crm_dining_queues.rb b/db/migrate/20170608105644_create_crm_dining_queues.rb new file mode 100644 index 00000000..3929719e --- /dev/null +++ b/db/migrate/20170608105644_create_crm_dining_queues.rb @@ -0,0 +1,12 @@ +class CreateCrmDiningQueues < ActiveRecord::Migration[5.1] + def change + create_table :crm_dining_queues do |t| + t.string :name + t.string :contact_no + t.string :queue_no + t.string :status + + t.timestamps + end + end +end diff --git a/spec/controllers/crm/bookings_controller_spec.rb b/spec/controllers/crm/bookings_controller_spec.rb deleted file mode 100644 index 9a65a516..00000000 --- a/spec/controllers/crm/bookings_controller_spec.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Crm::BookingsController, type: :controller do - -end diff --git a/spec/controllers/crm/customers_controller_spec.rb b/spec/controllers/crm/customers_controller_spec.rb deleted file mode 100644 index 0a1a4ff6..00000000 --- a/spec/controllers/crm/customers_controller_spec.rb +++ /dev/null @@ -1,159 +0,0 @@ -require 'rails_helper' - -# This spec was generated by rspec-rails when you ran the scaffold generator. -# It demonstrates how one might use RSpec to specify the controller code that -# was generated by Rails when you ran the scaffold generator. -# -# It assumes that the implementation code is generated by the rails scaffold -# generator. If you are using any extension libraries to generate different -# controller code, this generated spec may or may not pass. -# -# It only uses APIs available in rails and/or rspec-rails. There are a number -# of tools you can use to make these specs even more expressive, but we're -# sticking to rails and rspec-rails APIs to keep things simple and stable. -# -# Compared to earlier versions of this generator, there is very limited use of -# stubs and message expectations in this spec. Stubs are only used when there -# is no simpler way to get a handle on the object needed for the example. -# Message expectations are only used when there is no simpler way to specify -# that an instance is receiving a specific message. - -RSpec.describe Crm::CustomersController, type: :controller do - - # This should return the minimal set of attributes required to create a valid - # Crm::Customer. As you add validations to Crm::Customer, be sure to - # adjust the attributes here as well. - let(:valid_attributes) { - skip("Add a hash of attributes valid for your model") - } - - let(:invalid_attributes) { - skip("Add a hash of attributes invalid for your model") - } - - # This should return the minimal set of values that should be in the session - # in order to pass any filters (e.g. authentication) defined in - # Crm::CustomersController. Be sure to keep this updated too. - let(:valid_session) { {} } - - describe "GET #index" do - it "assigns all crm_customers as @crm_customers" do - customer = Crm::Customer.create! valid_attributes - get :index, params: {}, session: valid_session - expect(assigns(:crm_customers)).to eq([customer]) - end - end - - describe "GET #show" do - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - get :show, params: {id: customer.to_param}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - end - - describe "GET #new" do - it "assigns a new crm_customer as @crm_customer" do - get :new, params: {}, session: valid_session - expect(assigns(:crm_customer)).to be_a_new(Crm::Customer) - end - end - - describe "GET #edit" do - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - get :edit, params: {id: customer.to_param}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - end - - describe "POST #create" do - context "with valid params" do - it "creates a new Crm::Customer" do - expect { - post :create, params: {crm_customer: valid_attributes}, session: valid_session - }.to change(Crm::Customer, :count).by(1) - end - - it "assigns a newly created crm_customer as @crm_customer" do - post :create, params: {crm_customer: valid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to be_a(Crm::Customer) - expect(assigns(:crm_customer)).to be_persisted - end - - it "redirects to the created crm_customer" do - post :create, params: {crm_customer: valid_attributes}, session: valid_session - expect(response).to redirect_to(Crm::Customer.last) - end - end - - context "with invalid params" do - it "assigns a newly created but unsaved crm_customer as @crm_customer" do - post :create, params: {crm_customer: invalid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to be_a_new(Crm::Customer) - end - - it "re-renders the 'new' template" do - post :create, params: {crm_customer: invalid_attributes}, session: valid_session - expect(response).to render_template("new") - end - end - end - - describe "PUT #update" do - context "with valid params" do - let(:new_attributes) { - skip("Add a hash of attributes valid for your model") - } - - it "updates the requested crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: new_attributes}, session: valid_session - customer.reload - skip("Add assertions for updated state") - end - - it "assigns the requested crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: valid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - - it "redirects to the crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: valid_attributes}, session: valid_session - expect(response).to redirect_to(customer) - end - end - - context "with invalid params" do - it "assigns the crm_customer as @crm_customer" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: invalid_attributes}, session: valid_session - expect(assigns(:crm_customer)).to eq(customer) - end - - it "re-renders the 'edit' template" do - customer = Crm::Customer.create! valid_attributes - put :update, params: {id: customer.to_param, crm_customer: invalid_attributes}, session: valid_session - expect(response).to render_template("edit") - end - end - end - - describe "DELETE #destroy" do - it "destroys the requested crm_customer" do - customer = Crm::Customer.create! valid_attributes - expect { - delete :destroy, params: {id: customer.to_param}, session: valid_session - }.to change(Crm::Customer, :count).by(-1) - end - - it "redirects to the crm_customers list" do - customer = Crm::Customer.create! valid_attributes - delete :destroy, params: {id: customer.to_param}, session: valid_session - expect(response).to redirect_to(crm_customers_url) - end - end - -end diff --git a/spec/helpers/crm/dining_queues_helper_spec.rb b/spec/helpers/crm/dining_queues_helper_spec.rb new file mode 100644 index 00000000..1f104e6b --- /dev/null +++ b/spec/helpers/crm/dining_queues_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Crm::DiningQueuesHelper. For example: +# +# describe Crm::DiningQueuesHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Crm::DiningQueuesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/crm/crm_dining_queues_spec.rb b/spec/requests/crm/crm_dining_queues_spec.rb new file mode 100644 index 00000000..f8261136 --- /dev/null +++ b/spec/requests/crm/crm_dining_queues_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Crm::DiningQueues", type: :request do + describe "GET /crm_dining_queues" do + it "works! (now write some real specs)" do + get crm_dining_queues_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/crm/dining_queues_routing_spec.rb b/spec/routing/crm/dining_queues_routing_spec.rb new file mode 100644 index 00000000..20d81871 --- /dev/null +++ b/spec/routing/crm/dining_queues_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Crm::DiningQueuesController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/crm/dining_queues").to route_to("crm/dining_queues#index") + end + + it "routes to #new" do + expect(:get => "/crm/dining_queues/new").to route_to("crm/dining_queues#new") + end + + it "routes to #show" do + expect(:get => "/crm/dining_queues/1").to route_to("crm/dining_queues#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/crm/dining_queues/1/edit").to route_to("crm/dining_queues#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/crm/dining_queues").to route_to("crm/dining_queues#create") + end + + it "routes to #update via PUT" do + expect(:put => "/crm/dining_queues/1").to route_to("crm/dining_queues#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/crm/dining_queues/1").to route_to("crm/dining_queues#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/crm/dining_queues/1").to route_to("crm/dining_queues#destroy", :id => "1") + end + + end +end diff --git a/spec/views/crm/dining_queues/edit.html.erb_spec.rb b/spec/views/crm/dining_queues/edit.html.erb_spec.rb new file mode 100644 index 00000000..d6649b45 --- /dev/null +++ b/spec/views/crm/dining_queues/edit.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/edit", type: :view do + before(:each) do + @crm_dining_queue = assign(:crm_dining_queue, Crm::DiningQueue.create!( + :name => "MyString", + :contact => "MyString", + :queue_no => "MyString" + )) + end + + it "renders the edit crm_dining_queue form" do + render + + assert_select "form[action=?][method=?]", crm_dining_queue_path(@crm_dining_queue), "post" do + + assert_select "input[name=?]", "crm_dining_queue[name]" + + assert_select "input[name=?]", "crm_dining_queue[contact]" + + assert_select "input[name=?]", "crm_dining_queue[queue_no]" + end + end +end diff --git a/spec/views/crm/dining_queues/index.html.erb_spec.rb b/spec/views/crm/dining_queues/index.html.erb_spec.rb new file mode 100644 index 00000000..b368f621 --- /dev/null +++ b/spec/views/crm/dining_queues/index.html.erb_spec.rb @@ -0,0 +1,25 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/index", type: :view do + before(:each) do + assign(:crm_dining_queues, [ + Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + ), + Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + ) + ]) + end + + it "renders a list of crm/dining_queues" do + render + assert_select "tr>td", :text => "Name".to_s, :count => 2 + assert_select "tr>td", :text => "Contact".to_s, :count => 2 + assert_select "tr>td", :text => "Queue No".to_s, :count => 2 + end +end diff --git a/spec/views/crm/dining_queues/new.html.erb_spec.rb b/spec/views/crm/dining_queues/new.html.erb_spec.rb new file mode 100644 index 00000000..433d153d --- /dev/null +++ b/spec/views/crm/dining_queues/new.html.erb_spec.rb @@ -0,0 +1,24 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/new", type: :view do + before(:each) do + assign(:crm_dining_queue, Crm::DiningQueue.new( + :name => "MyString", + :contact => "MyString", + :queue_no => "MyString" + )) + end + + it "renders new crm_dining_queue form" do + render + + assert_select "form[action=?][method=?]", crm_dining_queues_path, "post" do + + assert_select "input[name=?]", "crm_dining_queue[name]" + + assert_select "input[name=?]", "crm_dining_queue[contact]" + + assert_select "input[name=?]", "crm_dining_queue[queue_no]" + end + end +end diff --git a/spec/views/crm/dining_queues/show.html.erb_spec.rb b/spec/views/crm/dining_queues/show.html.erb_spec.rb new file mode 100644 index 00000000..93d2554a --- /dev/null +++ b/spec/views/crm/dining_queues/show.html.erb_spec.rb @@ -0,0 +1,18 @@ +require 'rails_helper' + +RSpec.describe "crm/dining_queues/show", type: :view do + before(:each) do + @crm_dining_queue = assign(:crm_dining_queue, Crm::DiningQueue.create!( + :name => "Name", + :contact => "Contact", + :queue_no => "Queue No" + )) + end + + it "renders attributes in

" do + render + expect(rendered).to match(/Name/) + expect(rendered).to match(/Contact/) + expect(rendered).to match(/Queue No/) + end +end diff --git a/test/system/dining_queues_test.rb b/test/system/dining_queues_test.rb new file mode 100644 index 00000000..680e9dc1 --- /dev/null +++ b/test/system/dining_queues_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Crm::DiningQueuesTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit crm_dining_queues_url + # + # assert_selector "h1", text: "Crm::DiningQueue" + # end +end From e2e8045d0fc989b1f885eeaf94503ef3c4525f7e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Jun 2017 11:55:50 +0630 Subject: [PATCH 03/71] update crm layout --- app/assets/javascripts/CRM.js | 17 ++++ app/controllers/crm/bookings_controller.rb | 2 +- app/controllers/crm/customers_controller.rb | 16 +-- .../crm/dining_queues_controller.rb | 2 +- app/controllers/crm/home_controller.rb | 3 +- app/views/crm/customers/_form.html.erb | 10 +- app/views/crm/customers/index.html.erb | 99 +++++++++---------- app/views/crm/home/_booking.html.erb | 13 +-- app/views/crm/home/index.html.erb | 7 +- app/views/layouts/CRM.html.erb | 4 +- app/views/layouts/_header_crm.html.erb | 2 +- config/initializers/assets.rb | 4 + config/routes.rb | 4 +- 13 files changed, 98 insertions(+), 85 deletions(-) create mode 100644 app/assets/javascripts/CRM.js diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js new file mode 100644 index 00000000..66f161af --- /dev/null +++ b/app/assets/javascripts/CRM.js @@ -0,0 +1,17 @@ +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. +// +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// compiled file. JavaScript code in this file should be added after the last require_* statement. +// +// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details +// about supported directives. +// +//= require jquery +//= require bootstrap +//= require jquery_ujs +//= require turbolinks +//= require cable \ No newline at end of file diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb index eeb19f75..65511512 100644 --- a/app/controllers/crm/bookings_controller.rb +++ b/app/controllers/crm/bookings_controller.rb @@ -1,4 +1,4 @@ -class Crm::BookingsController < ApplicationController +class Crm::BookingsController < BaseCrmController def update_booking booking = Booking.find(params[:booking_id]) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index fff260e2..886f66d6 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -1,4 +1,4 @@ -class Crm::CustomersController < ApplicationController +class Crm::CustomersController < BaseCrmController before_action :set_crm_customer, only: [:show, :edit, :update, :destroy] # GET /crm/customers @@ -8,18 +8,17 @@ class Crm::CustomersController < ApplicationController filter = params[:filter] if filter.nil? - @crm_custome = Customer.order("name").page(params[:page]) + @crm_customers = Customer.order("name").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) else - @crm_custome = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) + @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) end - @crm_customers = Kaminari.paginate_array(@crm_custome).page(params[:page]).per(5) #@crm_customers = Customer.all @crm_customer = Customer.new - # @membership = Customer.get_member_group - # if @membership["status"] == true - # @member_group = @membership["data"] - # end + @membership = Customer.get_member_group + if @membership["status"] == true + @member_group = @membership["data"] + end respond_to do |format| format.html # index.html.erb format.json { render json: @crm_customers } @@ -74,6 +73,7 @@ class Crm::CustomersController < ApplicationController if response["status"] == true puts "hhhhhhhhhhhhhhhhhh" puts params[:sale_id] + puts response.to_json customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) if params[:sale_id] != 0 diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb index 235703d2..9e8cd06c 100644 --- a/app/controllers/crm/dining_queues_controller.rb +++ b/app/controllers/crm/dining_queues_controller.rb @@ -1,4 +1,4 @@ -class Crm::DiningQueuesController < ApplicationController +class Crm::DiningQueuesController < BaseCrmController before_action :set_dining_queue, only: [:show, :edit, :update, :destroy] # GET /crm/dining_queues diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb index c8d919e5..d1ee475b 100644 --- a/app/controllers/crm/home_controller.rb +++ b/app/controllers/crm/home_controller.rb @@ -5,7 +5,8 @@ class Crm::HomeController < BaseCrmController @customer = Customer.all from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc - @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to) + @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') + # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) end diff --git a/app/views/crm/customers/_form.html.erb b/app/views/crm/customers/_form.html.erb index 9e1046c3..c913651a 100644 --- a/app/views/crm/customers/_form.html.erb +++ b/app/views/crm/customers/_form.html.erb @@ -16,13 +16,5 @@ <%= f.button :submit %> <% end %> - + \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 786a9f42..d76c94ac 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -68,52 +68,64 @@

- <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> - - - <%= f.hidden_field :id, :class => "form-control col-md-6 " %> - -
- <%= f.input :name, :class => "form-control col-md-6 name" %> + <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + + + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> +
+ <%= f.button :submit, "Update Customer",:class => 'btn btn-primary btn-sm', :disabled =>'', :id => 'update_customer' %> +
+
+ <%= f.input :name, :class => "form-control col-md-6 name" %> -
-
- <%= f.input :company, :class => "form-control col-md-6 company" %> -
-
- <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> +
+
+ <%= f.input :company, :class => "form-control col-md-6 company" %> +
+
+ <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> -
+
-
- <%= f.input :email, :class => "form-control col-md-6 email" %> +
+ <%= f.input :email, :class => "form-control col-md-6 email" %> +
+ +
+ + <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%> +
+ +
+
-
- - <%= f.text_field :date_of_birth,:class=>"form-control datepicker date_of_birth",:readonly =>true, :value => @date_of_birth%> -
- - - -
- <%= f.input :membership_type, :class => "form-control col-md-6 membership_type" %> -
-
- <%= f.input :membership_authentication_code, :class => "form-control col-md-6 membership_authentication_code" %> - -
-
- <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> - <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> -
- <%end%> +
+ <%= f.input :membership_type, :class => "form-control col-md-6 membership_type" %>
+
+ <%= f.input :membership_authentication_code, :class => "form-control col-md-6 membership_authentication_code" %> +
+ +
+ <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> +
+ + <%end%>
+
+ + diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index b9cf7296..5d865002 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -38,7 +38,6 @@ $(function(){ $(".booking_click").on("click", function(){ - $(this).css('background-color', '#CCC'); $(".summary-items tbody tr").remove(); $("#cancel").removeAttr("disabled"); $("#assign").removeAttr("disabled"); @@ -94,7 +93,6 @@ $(function(){ $(".customer_detail").on("click", function(){ - $(this).css('background-color', '#CCC'); $(".summary-items tbody tr").remove(); $("#crm_print").removeAttr("disabled"); var id = $(this).attr('data-ref'); @@ -118,13 +116,14 @@ function show_details(url_item){ success: function(data) { item_data = data.order_items; //console.log(item_data.length); - + $("#table").text(data.table_name) $("#order_at").text(data.checkin_at) $("#order_by").text(data.checkin_by) $("#assign").val(data.id) $("#cancel").val(data.id) - + $('.no_record').addClass('hide'); + for(var field in item_data) { if (item_data[field].item_name){ var price = parseFloat(item_data[field].price).toFixed(2); @@ -157,13 +156,14 @@ function customer_details(id){ $("#for-booking").remove(); var div_data = "CUSTOMER DETAILS"; $("#order-title").replaceWith(div_data); - + $('.no_record').addClass('hide'); $('.customer-detail').removeClass('hide') ; $("#cus_name").text(data.name) $("#cus_email").text(data.email) $("#cus_contact_no").text(data.contact_no) + if(item_data.length>0){ for(var field in item_data) { if (item_data[field].item_name){ @@ -178,7 +178,8 @@ function customer_details(id){ $(".summary-items tbody").append(row); } }else{ - + $('.no_record').removeClass('hide'); + $("#crm_print").attr("disabled","disabled"); } } }); diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index 787b2e39..0912ee70 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -18,7 +18,7 @@
-
+
<%= render :partial => 'queue' %>
@@ -30,7 +30,7 @@
-
+
<%= render :partial => 'customer' %>
@@ -90,6 +90,9 @@
+ + +
Qty Price
No Order Items
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb index 41de0ca2..fb851d68 100644 --- a/app/views/layouts/CRM.html.erb +++ b/app/views/layouts/CRM.html.erb @@ -9,8 +9,8 @@ SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'CRM', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/layouts/_header_crm.html.erb b/app/views/layouts/_header_crm.html.erb index 31dee08d..e004853e 100644 --- a/app/views/layouts/_header_crm.html.erb +++ b/app/views/layouts/_header_crm.html.erb @@ -4,7 +4,7 @@ CRM
- Queue | Bookings | Online Orders | <%= link_to 'Customer', crm_customers_path, :html=>":color:white" %> + <%= link_to 'Queue', crm_dining_queues_path, :html=>":color:white" %> | Bookings | Online Orders | <%= link_to 'Customer', crm_customers_path, :html=>":color:white" %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 6f563b42..fe5eec86 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -18,3 +18,7 @@ Rails.application.config.assets.precompile += %w( OQS.css ) Rails.application.config.assets.precompile += %w( OQS.js ) Rails.application.config.assets.precompile += %w( settings.css ) + +# --- Customer/ Customer - Crm ---- +Rails.application.config.assets.precompile += %w( CRM.css ) +Rails.application.config.assets.precompile += %w( CRM.js ) diff --git a/config/routes.rb b/config/routes.rb index e2e58781..aa3c878f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -94,10 +94,10 @@ Rails.application.routes.draw do #--------- Customer Relationship Management ------------# namespace :crm do - root "home#index" #queue number - get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm + root "home#index" resources :customers resources :dining_queues + get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel post "update_sale" , to: "home#update_sale_by_customer"#update customer id in sale table get '/print/:id', to: "home#print_order"#print order for crm From ba9ebe12dedcd32881a83331fc5276c2e380e2a0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Jun 2017 12:00:46 +0630 Subject: [PATCH 04/71] update customer --- app/controllers/crm/customers_controller.rb | 2 +- app/views/crm/customers/index.html.erb | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 886f66d6..518c2e3e 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -142,7 +142,7 @@ class Crm::CustomersController < BaseCrmController else - format.html { render :edit } + format.html { render :index } format.json { render json: @crm_customer.errors, status: :unprocessable_entity } end diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index d76c94ac..18605877 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -72,9 +72,7 @@ <%= f.hidden_field :id, :class => "form-control col-md-6 " %> -
- <%= f.button :submit, "Update Customer",:class => 'btn btn-primary btn-sm', :disabled =>'', :id => 'update_customer' %> -
+
<%= f.input :name, :class => "form-control col-md-6 name" %> @@ -117,8 +115,8 @@
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> -
- + <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> +
<%end%>
From 56ffd1f063b7c2d210808cbe1152586da0bd6053 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 9 Jun 2017 13:13:20 +0630 Subject: [PATCH 05/71] update sale order talble --- app/models/sale.rb | 8 ++++---- app/models/sale_order.rb | 18 +++++++++++++++--- app/models/sale_payment.rb | 2 +- app/models/seed_generator.rb | 12 ++++++++++-- .../20170403140820_create_order_items.rb | 1 + ...403153001_create_payment_method_settings.rb | 2 +- .../20170403174029_create_sale_orders.rb | 4 ++-- ...20170421171849_add_company_address_email.rb | 5 ----- ...11602_additionparametertopaymentsettings.rb | 5 ----- 9 files changed, 34 insertions(+), 23 deletions(-) delete mode 100644 db/migrate/20170421171849_add_company_address_email.rb delete mode 100644 db/migrate/20170608111602_additionparametertopaymentsettings.rb diff --git a/app/models/sale.rb b/app/models/sale.rb index b0f07cb0..93ed327c 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -3,7 +3,6 @@ class Sale < ApplicationRecord #primary key - need to be unique generated for multiple shops before_create :generate_custom_id - #before_create :generate_receipt_no belongs_to :cashier, :optional => true belongs_to :customer, :optional => true @@ -33,7 +32,6 @@ class Sale < ApplicationRecord booking.sale_id = sale_id end order = booking.booking_orders.take.order - puts "add sale order" link_order_sale(order.id) return status, sale_id end @@ -231,9 +229,10 @@ class Sale < ApplicationRecord def link_order_sale(order_id) #create if it doesn't exist saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take - + if saleOrder.nil? - SaleOrder.create(:sale_id => self.id, :order_id => order_id) + sale_order = SaleOrder.new + sale_order.create_sale_order(self.id, order_id) end # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) # SaleOrder.create(:sale_id => self.id, :order_id => order_id) @@ -261,6 +260,7 @@ class Sale < ApplicationRecord end private + def generate_custom_id self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 15da1386..5c8fea71 100644 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -2,13 +2,25 @@ class SaleOrder < ApplicationRecord self.primary_key = "sale_order_id" #primary key - need to be unique generated for multiple shops - before_create :generate_custom_id + before_create :generate_sale_order_id belongs_to :sale belongs_to :order + def create_sale_order(sale, order) + self.sale_id = sale + self.order_id = order + self.save + + end + private - def generate_custom_id - self.sale_order_id = SeedGenerator.generate_id(self.class.name, "SOI") + def generate_sale_order_id + puts "create slae order id" + self.class.name + saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") + puts saleOrderId + self.sale_order_id = saleOrderId + puts "create sale order id" end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index d8aa1cee..6a9860c7 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -207,7 +207,7 @@ class SalePayment < ApplicationRecord def sale_update_payment_status(paid_amount) #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f - self.sale.amount_changed = paid_amount - self.sale.amount_received + self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0) self.sale.payment_status = "paid" self.sale.sale_status = "completed" diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 5e7864b6..b333111f 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,14 +1,20 @@ class SeedGenerator < ApplicationRecord + def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) + puts "found seed" + puts seed new_receipt_no = 0 + if (seed.nil?) + puts "seed is null" seed = SeedGenerator.new() seed.model = model new_receipt_no = seed.next seed.save else + puts "seed is not null" current_no = seed.next seed.next = seed.next + seed.increase_by seed.current = current_no @@ -16,8 +22,10 @@ class SeedGenerator < ApplicationRecord end padding_len = 15 - prefix.length - - return prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + puts prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + puts "this is actural sale orde" + saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + return saleOrderId end diff --git a/db/migrate/20170403140820_create_order_items.rb b/db/migrate/20170403140820_create_order_items.rb index b0f43c32..c5382030 100644 --- a/db/migrate/20170403140820_create_order_items.rb +++ b/db/migrate/20170403140820_create_order_items.rb @@ -13,6 +13,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1] t.string :options t.json :set_menu_items #this parameter is require to route the items correctly t.boolean :taxable, :null => false, :default => true + t.string :completed_by t.timestamps end end diff --git a/db/migrate/20170403153001_create_payment_method_settings.rb b/db/migrate/20170403153001_create_payment_method_settings.rb index 981d42d3..339a3187 100644 --- a/db/migrate/20170403153001_create_payment_method_settings.rb +++ b/db/migrate/20170403153001_create_payment_method_settings.rb @@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1] t.string :gateway_url t.string :auth_token t.string :merchant_account_id - + t.string :additional_parameters t.timestamps end end diff --git a/db/migrate/20170403174029_create_sale_orders.rb b/db/migrate/20170403174029_create_sale_orders.rb index e2b3fe40..a786163b 100644 --- a/db/migrate/20170403174029_create_sale_orders.rb +++ b/db/migrate/20170403174029_create_sale_orders.rb @@ -1,8 +1,8 @@ class CreateSaleOrders < ActiveRecord::Migration[5.1] def change create_table :sale_orders, :id => false do |t| - t.primary_key :sale_order_id #custom primary key - to ensure consistence for cloud syncing - + + t.string :sale_order_id, :limit => 16, :primary_key => true t.string :sale_id, foreign_key: true,:limit => 16 t.string :order_id, foreign_key: true, :limit => 16 diff --git a/db/migrate/20170421171849_add_company_address_email.rb b/db/migrate/20170421171849_add_company_address_email.rb deleted file mode 100644 index 3bf6602e..00000000 --- a/db/migrate/20170421171849_add_company_address_email.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCompanyAddressEmail < ActiveRecord::Migration[5.1] - def change - add_column :order_items, :completed_by, :string - end -end diff --git a/db/migrate/20170608111602_additionparametertopaymentsettings.rb b/db/migrate/20170608111602_additionparametertopaymentsettings.rb deleted file mode 100644 index ec85c209..00000000 --- a/db/migrate/20170608111602_additionparametertopaymentsettings.rb +++ /dev/null @@ -1,5 +0,0 @@ -class Additionparametertopaymentsettings < ActiveRecord::Migration[5.1] - def change - add_column :payment_method_settings, :additional_parameters, :string - end -end From 5d89713bb6239304bb99df50b2b375d352ca8555 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Jun 2017 13:24:20 +0630 Subject: [PATCH 06/71] crm print update --- Gemfile.lock | 2 + app/pdf/crm_order_pdf.rb | 94 ++++++++++++++++++++----------- app/views/crm/home/index.html.erb | 2 +- 3 files changed, 65 insertions(+), 33 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6a7c6340..4235d035 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,6 +110,7 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) + pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -246,6 +247,7 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index 94fc5503..55d08ecc 100644 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -1,6 +1,6 @@ class CrmOrderPdf < Prawn::Document attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width - def initialize(booking,order_items,print_settings) + def initialize(booking,order_items,printer_settings) self.p_width = 200 self.page_height = 1450 self.margin = 10 @@ -18,20 +18,19 @@ class CrmOrderPdf < Prawn::Document @half_qty = @qty_width / 2 #setting page margin and width super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) - self.header_font_size = 7 + self.header_font_size = 10 self.item_font_size = 9 - header( booking.type, booking.dining_facility.name) + header( printer_settings.printer_name, printer_settings.name) stroke_horizontal_rule - order_detail(booking.checkin_by,booking.checkin_at,booking.dining_facility.name) + cashier_info(booking) line_items(order_items) - #all_total(order_items) end - def header (type, name) - text "#{type}", :size => self.header_font_size,:align => :center + def header (printer_name, name) + text "#{printer_name}", :size => self.header_font_size,:align => :center move_down 5 text "#{name}", :size => self.header_font_size,:align => :center # move_down self.item_height @@ -41,37 +40,37 @@ class CrmOrderPdf < Prawn::Document end - def order_detail(order_by,order_at,customer) + def cashier_info(booking) move_down 5 move_down 2 y_position = cursor - qty_column_width = self.p_width * 0.2 - item_description_width = self.p_width * 0.5 - price_column_width = self.p_width * 0.3 + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Order By:", :size => self.item_font_size,:align => :left + end - - - stroke_horizontal_rule + bounding_box([self.price_width, y_position], :width =>self.receipt_width) do + text "#{booking.checkin_by}" , :size => self.item_font_size, :align => :left + end move_down 5 + y_position = cursor - pad_top(15) { - # @item_width.to_i + @half_qty.to_i - text_box "Order By", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size - text_box "Order At", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Customer", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - - } - + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Customer:", :size => self.item_font_size,:align => :left + end + bounding_box([self.price_width,y_position], :width =>self.price_width) do + text "#{booking.customer_id}" , :size => self.item_font_size,:align => :left + end move_down 5 - stroke_horizontal_rule -y_position = cursor - pad_top(15) { - text_box "#{order_by}", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "#{order_at.to_i}", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "#{customer}", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - - } + y_position = cursor + bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + text "Date:", :size => self.item_font_size,:align => :left + end + bounding_box([self.price_width,y_position], :width =>self.price_width) do + text "#{booking.checkin_at.strftime('%Y %m %d %h:%m')}" , :size => self.item_font_size,:align => :left + end + # stroke_horizontal_rule + move_down 5 end def line_items(order_items) @@ -97,10 +96,41 @@ y_position = cursor move_down 5 stroke_horizontal_rule - + add_line_item_row(order_items) + end - + def add_line_item_row(order_items) + y_position = cursor + move_down 5 + sub_total = 0.0 + order_items.each do |item| + + sub_total += item.qty*item.price + qty = item.qty + total_price = item.qty*item.price + price = item.price + item_name = item.item_name + + + y_position = cursor + + pad_top(15) { + # @item_width.to_i + @half_qty.to_i + text_box "#{item_name}", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size + text_box "#{price}", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "#{qty.to_i}", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "#{total_price}", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + + } + move_down 3 + end + stroke_horizontal_rule + move_down 5 + y_position = cursor + + end + end diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index 0912ee70..87e601d9 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -116,7 +116,7 @@ - + From 9c228dce5cc8de2c5a05c405db1293a7670899fe Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 9 Jun 2017 13:26:47 +0630 Subject: [PATCH 07/71] update view crm --- app/views/crm/customers/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 18605877..184bce41 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -60,7 +60,7 @@
-

asdfj;l

+ <%= paginate @crm_customers %>
From 8b99f4844e40f83d9d6e3bd82d29f6f1eff45fb6 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 9 Jun 2017 13:33:12 +0630 Subject: [PATCH 08/71] bill api return updated --- app/controllers/api/bill_controller.rb | 6 +++--- app/controllers/origami/payments_controller.rb | 5 +++++ app/models/sale_payment.rb | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index a98c8f3d..193a4a45 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController #create Bill by Booking ID if (params[:booking_id]) @sale = Sale.new - @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) - + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + elsif (params[:order_id]) @sale = Sale.new - @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) end end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index c60efdac..fa8135fe 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] if Sale.exists?(sale_id) @sale_data = Sale.find_by_sale_id(sale_id) + @sale_date.sale_payments.each do |spay| + if spay.payment_method == "cash" + @cash = spay.payment_amount + end + end end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1d98ba8f..573a2da3 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -211,6 +211,7 @@ class SalePayment < ApplicationRecord self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0) + puts " sale update ......" self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! From d2373f2f2494bbd65243d0720c4dc3decb96c8c9 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 9 Jun 2017 13:35:15 +0630 Subject: [PATCH 09/71] origami updating --- app/assets/javascripts/origami.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 8ce3d0c4..61bff6e9 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -18,6 +18,13 @@ $(document).ready(function(){ $(".orders").on('click', function(){ + $("#order-sub-total").text(''); + $("#order-food").text(''); + $("#order-beverage").text(''); + $("#order-discount").text(''); + $("#order-Tax").text(''); + $("#order-grand-total").text(''); + var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); var unique_id=$(this).find(".orders-id").text(); @@ -66,7 +73,8 @@ $(document).ready(function(){ //Receipt Charges sub_total += (parse_data.qty*parse_data.price); - discount_amount = parse_data.discount_amount; + + discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount; tax_amount = parse_data.tax_amount; grand_total_amount = parse_data.grand_total_amount; From 0b04e2d4ef5ce1ab82693c5ce7a82c2fd4ca15f5 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 9 Jun 2017 13:35:41 +0630 Subject: [PATCH 10/71] add base report controller --- app/controllers/base_report_controller.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 app/controllers/base_report_controller.rb diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb new file mode 100644 index 00000000..77e38f2c --- /dev/null +++ b/app/controllers/base_report_controller.rb @@ -0,0 +1,8 @@ +class BaseReportController < ActionController::Base + include LoginVerification + + #before_action :check_installation + protect_from_forgery with: :exception + + +end From a100d742e6ed376d786f55a15f0cd10ca2c01a99 Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 9 Jun 2017 13:47:00 +0630 Subject: [PATCH 11/71] add crm order printer in seed --- db/seeds.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index fc19164d..d763174d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -136,13 +136,10 @@ zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_o #Create Adminstrator employee admin_employee = Employee.create({name: "Administrator", role: "Administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"}) -#Account for Menu Item Type (eg: Food, Beverage) -food = Account.create({title: "Food", account_type: "0"}) -beverage = Account.create({title: "Beverage", account_type: "1"}) - order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"}) order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"}) request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) +crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", From 82de95ca22654c4b1369dd323a9a5eca3507ffe9 Mon Sep 17 00:00:00 2001 From: Nweni Date: Fri, 9 Jun 2017 13:52:36 +0630 Subject: [PATCH 12/71] update --- app/controllers/crm/customers_controller.rb | 32 ++++++++----------- .../origami/payments_controller.rb | 2 +- app/models/sale.rb | 1 - app/models/sale_order.rb | 3 -- app/models/sale_payment.rb | 12 ++++++- app/models/seed_generator.rb | 6 ---- app/views/origami/payments/show.html.erb | 2 +- 7 files changed, 27 insertions(+), 31 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 325ac7dd..e1283bd6 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -38,10 +38,10 @@ class Crm::CustomersController < ApplicationController def create @crm_customers = Customer.new(customer_params) - + respond_to do |format| if @crm_customers.save - + name = customer_params[:name] phone = customer_params[:contact_no] @@ -63,12 +63,10 @@ class Crm::CustomersController < ApplicationController ) if response["status"] == true - puts "hhhhhhhhhhhhhhhhhh" - puts params[:sale_id] customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - if params[:sale_id] != 0 - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } + if params[:sale_id] != 0 + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: 'Customer was successfully created.' } end @@ -77,27 +75,27 @@ class Crm::CustomersController < ApplicationController @crm_customers.destroy - if params[:sale_id] != 0 + if params[:sale_id] != 0 format.html { redirect_to crm_customers_path, notice: response["message"] } - + else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } end - + end - + # format.json { render :index, status: :created, location: @crm_customers } else if params[:sale_id] != 0 format.html { redirect_to crm_customers_path} format.json { render json: @crm_customers.errors, status: :unprocessable_entity } - + else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } end - + end end end @@ -105,7 +103,7 @@ class Crm::CustomersController < ApplicationController # PATCH/PUT /crm/customers/1 # PATCH/PUT /crm/customers/1.json def update - + respond_to do |format| if @crm_customer.update(customer_params) @@ -118,7 +116,7 @@ class Crm::CustomersController < ApplicationController membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + "/api/update_membership_customer".to_s - + response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, id: id}.to_json, @@ -127,7 +125,7 @@ class Crm::CustomersController < ApplicationController 'Accept' => 'application/json' } ) - + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } @@ -153,7 +151,7 @@ class Crm::CustomersController < ApplicationController # DELETE /crm/customers/1 # DELETE /crm/customers/1.json def get_sale_id - + @sale_id = params[:sale_id] @crm_customers = Customer.all @crm_customer = Customer.new @@ -179,5 +177,3 @@ class Crm::CustomersController < ApplicationController params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_type, :membership_authentication_code) end end - - diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index fa8135fe..a3831439 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -18,7 +18,7 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] if Sale.exists?(sale_id) @sale_data = Sale.find_by_sale_id(sale_id) - @sale_date.sale_payments.each do |spay| + @sale_data.sale_payments.each do |spay| if spay.payment_method == "cash" @cash = spay.payment_amount end diff --git a/app/models/sale.rb b/app/models/sale.rb index 93ed327c..47d271f1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -16,7 +16,6 @@ class Sale < ApplicationRecord scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } def generate_invoice_from_booking(booking_id, requested_by) - puts "get invoice from booking" booking = Booking.find(booking_id) status = false Rails.logger.debug "Booking -> " + booking.id.to_s diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 5c8fea71..786054c9 100644 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -16,11 +16,8 @@ class SaleOrder < ApplicationRecord private def generate_sale_order_id - puts "create slae order id" self.class.name saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") - puts saleOrderId self.sale_order_id = saleOrderId - puts "create sale order id" end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 573a2da3..bb829962 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -205,12 +205,22 @@ class SalePayment < ApplicationRecord end def sale_update_payment_status(paid_amount) + puts "sale update" #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f - if (self.sale.grand_total <= self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0) + all_received_amount = 0.0 + sObj = self.sale + sObj.sale_payments.each do |spay| + puts spay + puts spay.payment_amount + all_received_amount += spay.payment_amount.to_f + end + puts all_received_amount + puts self.sale.grand_total + if (self.sale.grand_total <= all_received_amount) puts " sale update ......" self.sale.payment_status = "paid" self.sale.sale_status = "completed" diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index b333111f..fe896a4d 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -2,19 +2,15 @@ class SeedGenerator < ApplicationRecord def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) - puts "found seed" - puts seed new_receipt_no = 0 if (seed.nil?) - puts "seed is null" seed = SeedGenerator.new() seed.model = model new_receipt_no = seed.next seed.save else - puts "seed is not null" current_no = seed.next seed.next = seed.next + seed.increase_by seed.current = current_no @@ -22,8 +18,6 @@ class SeedGenerator < ApplicationRecord end padding_len = 15 - prefix.length - puts prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') - puts "this is actural sale orde" saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') return saleOrderId diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 85505ef5..f16ef927 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -78,7 +78,7 @@
CASH
-
0.0
+
<%= @cash %>
From 9f9c83ab7fc504f5e13709e317580fd1e33b2106 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 13:01:03 +0630 Subject: [PATCH 13/71] pay par payment --- app/assets/javascripts/orgiami.js | 2 +- app/controllers/origami/others_payments_controller.rb | 1 + app/controllers/origami/paypar_payments_controller.rb | 1 - app/controllers/settings/membership_actions_controller.rb | 2 +- app/views/origami/others_payments/index.html.erb | 7 ++++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/orgiami.js index 92bdcbf3..20ac5b26 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/orgiami.js @@ -145,7 +145,7 @@ $(document).ready(function(){ // Payment for Bill $('#pay').click(function() { var sale_id=$(".selected-item").find(".orders-id").text(); - if(order_id!=""){ + if(sale_id!=""){ window.location.href = '/origami/sale/'+ sale_id + "/payment" } else { diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index a5177b06..c050c3f3 100644 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -5,6 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController @membership_rebate_balance = 0 @sale_id = params[:sale_id] @payment_method_setting = PaymentMethodSetting.all + # @sale_id = params[:sale_id] # sale_data = Sale.find_by_sale_id(@sale_id) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index af5ce55f..67850117 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -8,7 +8,6 @@ class Origami::PayparPaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) - if status == true @out = true, "Success!" else diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 6db1a45b..86292258 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -24,7 +24,7 @@ class Settings::MembershipActionsController < ApplicationController membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance + @out = true, @membership_rebate_balance,@membership_id else @out = false, 0 end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 77c06904..4a43dd1e 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -86,7 +86,7 @@
-
PAY
+
PAY
@@ -143,6 +143,7 @@ $("#REDIMREBATE").click(function(){ url: "../../../../settings/membership_actions", data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id}, success: function(result){ + $("#redeem").attr("data-member-value",result[2]); $("#valid_amount").val(result[1]); } }) @@ -152,8 +153,8 @@ $("#REDIMREBATE").click(function(){ $("#redeem").click(function(){ valid_amount = $("#valid_amount").val(); - sale_id = $("#REDIMREBATE").attr("data-sale-id"); - membership_id = $(this).attr("data-member-value"); + sale = "<%=@sale_id %>"; + membership_id = $(this).attr('data-member-value'); redeem_amount = parseInt($("#used_amount").text()); if(redeem_amount<=0){ alert(" Insufficient Amount!") From aa8068ad10e5a693a2e558efd739ada74ebec391 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 13:02:03 +0630 Subject: [PATCH 14/71] Update --- .../origami/paypar_payments_controller.rb | 4 ++-- .../settings/membership_actions_controller.rb | 6 ++++-- .../origami/others_payments/index.html.erb | 21 +++++++++---------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index af5ce55f..b145ff63 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -8,7 +8,7 @@ class Origami::PayparPaymentsController < BaseOrigamiController saleObj = Sale.find(sale_id) sale_payment = SalePayment.new status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) - + if status == true @out = true, "Success!" else @@ -19,4 +19,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController end end -end \ No newline at end of file +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 6db1a45b..0d1f8b78 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -14,13 +14,15 @@ class Settings::MembershipActionsController < ApplicationController if !membership_actions_data.nil? url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) + puts customer_data.to_json @membership_id = customer_data.membership_id @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts membership_setting membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @@ -41,7 +43,7 @@ class Settings::MembershipActionsController < ApplicationController end render :json => @out.to_json end - + end # GET /settings/membership_actions/1 diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 77c06904..f76d5146 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,15 +1,15 @@
- +
<% @payment_method_setting.each do |payment_method|%>
<%= payment_method.payment_method %>
- <% end %> + <% end %>
- +
+
0.0
-
+
@@ -86,16 +86,16 @@
-
PAY
+
PAY
- +
- +
\ No newline at end of file + From 7ab9874b808d5906d8ae369c4571f69bbaa1abc2 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 13:20:26 +0630 Subject: [PATCH 15/71] remove migration files --- app/views/origami/home/index.html.erb | 84 +++++++++++++-------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index fa521d6c..9e406ede 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -21,23 +21,23 @@
- <% - @booking_orders.each do |bko| + <% + @booking_orders.each do |bko| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if bko.order_status == 'new' + if bko.order_status == 'new' unique_id=bko.booking_id - else + else unique_id=bko.sale_id sale_status="sold" - end + end %>
- -

<%= bko.table_name %>

+ +

<%= bko.table_name %>

Receipt No : @@ -48,12 +48,12 @@ Order Status : <%= bko.order_status %> - + -

-
-
- <% +

+
+
+ <% end %>
@@ -62,23 +62,23 @@
- <% - @booking_rooms.each do |rmo| + <% + @booking_rooms.each do |rmo| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if rmo.order_status == 'new' - unique_id=rmo.booking_id - else + if rmo.order_status == 'new' + unique_id=rmo.booking_id + else unique_id=rmo.sale_id sale_status="sold" - end + end %>
- -

<%= rmo.room_name %>

+ +

<%= rmo.room_name %>

Receipt No : @@ -89,12 +89,12 @@ Order Status : <%= rmo.order_status %> - + -

-
-
- <% +

+
+
+ <% end %>
@@ -103,23 +103,23 @@
- <% - @orders.each do |odr| + <% + @orders.each do |odr| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if odr.order_status == 'new' + if odr.order_status == 'new' unique_id=odr.booking_id - else + else unique_id=odr.sale_id sale_status="sold" - end + end %>
- -

<%= odr.table_name %>

+ +

<%= odr.table_name %>

Receipt No : @@ -130,16 +130,16 @@ Order Status : <%= odr.order_status %> - + -

-
-
- <% +

+
+
+ <% end %> - + @@ -157,10 +157,10 @@

Receipt No:

Cashier:

-
+

Date:

-
+
@@ -205,7 +205,7 @@
- + @@ -215,7 +215,7 @@ - + From d49dc3f8c894ab8f7b68b6f1d45f2efaa1f090b1 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 13:55:14 +0630 Subject: [PATCH 16/71] change route --- app/models/membership_action.rb | 2 ++ app/models/sale_payment.rb | 2 +- app/views/origami/others_payments/index.html.erb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 app/models/membership_action.rb diff --git a/app/models/membership_action.rb b/app/models/membership_action.rb new file mode 100644 index 00000000..93a4b3d8 --- /dev/null +++ b/app/models/membership_action.rb @@ -0,0 +1,2 @@ +class MembershipAction < ApplicationRecord +end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 834dba1f..57188d5c 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -79,7 +79,7 @@ class SalePayment < ApplicationRecord end def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id) - membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url"); + membership_actions_data = MembershipAction.find_by_membership_type("redeem"); if !membership_actions_data.nil? url = paypar_url.to_s + membership_actions_data.gateway_url.to_s campaign_type_id = 1 diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 4a43dd1e..404306e7 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -141,7 +141,7 @@ $("#REDIMREBATE").click(function(){ $.ajax({ type: "GET", url: "../../../../settings/membership_actions", - data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id}, + data: {type:"get_account_balance",gateway_url:gateway_url,sale_id:sale_id}, success: function(result){ $("#redeem").attr("data-member-value",result[2]); $("#valid_amount").val(result[1]); From 596c16d27480ee526297627ae7dd57ff9837fe31 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 14:09:19 +0630 Subject: [PATCH 17/71] edit redeem --- app/views/origami/others_payments/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 5cf1bfd4..bd77effd 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -133,7 +133,7 @@ $(document).on('click', '.cashier_number', function(event){ // return false; // } }); -$("#REDIMREBATE").click(function(){ +$("#REDEEMREBATE").click(function(){ $('.rebate-form').removeAttr("hidden"); gateway_url = $(this).attr("data-url"); sale_id = $(this).attr("data-sale-id"); From 33cc576f1e9f8695a56bba391236c93709cd749c Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 15:48:53 +0630 Subject: [PATCH 18/71] edit membership setting , otherpayment page --- .../origami/redeem_payments.coffee | 3 + .../stylesheets/origami/redeem_payments.scss | 3 + .../origami/redeem_payments_controller.rb | 41 +++++ .../settings/membership_actions_controller.rb | 53 +----- app/helpers/origami/redeem_payments_helper.rb | 2 + app/models/settings/membership_action.rb | 2 - .../origami/others_payments/index.html.erb | 166 +----------------- .../origami/redeem_payments/index.html.erb | 157 +++++++++++++++++ .../membership_actions/_form.html.erb | 2 +- .../settings/membership_actions/edit.html.erb | 2 +- .../membership_actions/index.html.erb | 4 +- config/routes.rb | 1 + ...170611084537_create_membership_actions.rb} | 7 +- .../redeem_payments_controller_spec.rb | 5 + .../origami/redeem_payments_helper_spec.rb | 15 ++ 15 files changed, 248 insertions(+), 215 deletions(-) create mode 100644 app/assets/javascripts/origami/redeem_payments.coffee create mode 100644 app/assets/stylesheets/origami/redeem_payments.scss create mode 100644 app/controllers/origami/redeem_payments_controller.rb create mode 100644 app/helpers/origami/redeem_payments_helper.rb delete mode 100644 app/models/settings/membership_action.rb create mode 100644 app/views/origami/redeem_payments/index.html.erb rename db/migrate/{20170608104900_create_settings_membership_actions.rb => 20170611084537_create_membership_actions.rb} (64%) create mode 100644 spec/controllers/origami/redeem_payments_controller_spec.rb create mode 100644 spec/helpers/origami/redeem_payments_helper_spec.rb diff --git a/app/assets/javascripts/origami/redeem_payments.coffee b/app/assets/javascripts/origami/redeem_payments.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/origami/redeem_payments.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/ diff --git a/app/assets/stylesheets/origami/redeem_payments.scss b/app/assets/stylesheets/origami/redeem_payments.scss new file mode 100644 index 00000000..8fdd1e53 --- /dev/null +++ b/app/assets/stylesheets/origami/redeem_payments.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the origami/redeem_payments controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb new file mode 100644 index 00000000..732f969e --- /dev/null +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -0,0 +1,41 @@ +class Origami::RedeemPaymentsController < BaseOrigamiController + def index + sale_id = params[:sale_id] + payment_method = params[:payment_method] + @membership_rebate_balance=0 + sale_data = Sale.find_by_sale_id(sale_id) + if sale_data + if sale_data.customer_id + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + if customer_data + @membership_id = customer_data.membership_id + @campaign_type_id =1 + if !@membership_id.nil? + membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts 'Hello Hello' + puts membership_setting.to_json + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + puts member_actions.to_json + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + puts url + + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) + if membership_data["status"]==true + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + else + @out = false, 0 + end + @out = false, 0 + end +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 50aad862..ad7311f2 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -4,46 +4,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions # GET /settings/membership_actions.json def index - type = params[:type] - @sale_id = params[:sale_id] - if type.nil? - @settings_membership_actions = Settings::MembershipAction.all - else - membership_actions_data=Settings::MembershipAction.find_by_membership_type(type) - - if !membership_actions_data.nil? - url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s - puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) - if sale_data.customer_id - customer_data= Customer.find_by_customer_id(sale_data.customer_id) - puts customer_data.to_json - @membership_id = customer_data.membership_id - @campaign_type_id =1 - if !@membership_id.nil? - membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - puts membership_setting - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) - if membership_data["status"]==true - @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance,@membership_id - else - @out = false, 0 - end - else - @out = false, 0 - end - else - @out =false, 0 - end - # campaign_type_id=1 - # get_account_data = MembershipAction.get_account_data(url) - else - @out = false, 0 - end - render :json => @out.to_json - end - + @settings_membership_actions = MembershipAction.all end # GET /settings/membership_actions/1 @@ -53,7 +14,7 @@ class Settings::MembershipActionsController < ApplicationController # GET /settings/membership_actions/new def new - @settings_membership_action = Settings::MembershipAction.new + @settings_membership_action = MembershipAction.new end # GET /settings/membership_actions/1/edit @@ -63,11 +24,11 @@ class Settings::MembershipActionsController < ApplicationController # POST /settings/membership_actions # POST /settings/membership_actions.json def create - @settings_membership_action = Settings::MembershipAction.new(settings_membership_action_params) + @settings_membership_action = MembershipAction.new(settings_membership_action_params) respond_to do |format| if @settings_membership_action.save - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully created.' } + format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' } format.json { render :show, status: :created, location: @settings_membership_action } else format.html { render :new } @@ -81,7 +42,7 @@ class Settings::MembershipActionsController < ApplicationController def update respond_to do |format| if @settings_membership_action.update(settings_membership_action_params) - format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully updated.' } + format.html { redirect_to settings_membership_action_path, notice: 'Membership action was successfully updated.' } format.json { render :show, status: :ok, location: @settings_membership_action } else format.html { render :edit } @@ -103,11 +64,11 @@ class Settings::MembershipActionsController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_settings_membership_action - @settings_membership_action = Settings::MembershipAction.find(params[:id]) + @settings_membership_action = MembershipAction.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. def settings_membership_action_params - params.require(:settings_membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) + params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter) end end diff --git a/app/helpers/origami/redeem_payments_helper.rb b/app/helpers/origami/redeem_payments_helper.rb new file mode 100644 index 00000000..7e9151cb --- /dev/null +++ b/app/helpers/origami/redeem_payments_helper.rb @@ -0,0 +1,2 @@ +module Origami::RedeemPaymentsHelper +end diff --git a/app/models/settings/membership_action.rb b/app/models/settings/membership_action.rb deleted file mode 100644 index 814e4b97..00000000 --- a/app/models/settings/membership_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Settings::MembershipAction < ApplicationRecord -end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 5cf1bfd4..6ea1ae5e 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -4,174 +4,20 @@
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
- -
- -
-
-
-
-
-
1
-
2
-
3
-
-
-
-
1000
-
-
-
-
-
-
4
-
5
-
6
-
-
-
-
5000
-
-
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
-
-
- -
diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb new file mode 100644 index 00000000..5e336ac4 --- /dev/null +++ b/app/views/origami/redeem_payments/index.html.erb @@ -0,0 +1,157 @@ +
+ +
+
+
+
+
+ + +
+
+
+
+
+ +
0.0
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
1
+
2
+
3
+
+
+
+
1000
+
+
+
+
+
+
4
+
5
+
6
+
+
+
+
5000
+
+
+
+
+
+
7
+
8
+
9
+
+
+
+
10000
+
+
+
+
+
+
0
+
.
+
00
+
+
+
+
50000
+
+
+
+
+
+
+
DEL
+
CLR
+
+
+
+
PAY
+
+
+
+
+ +
+
+
+ +
+ diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb index 9f4a2cd5..3084d4ac 100644 --- a/app/views/settings/membership_actions/_form.html.erb +++ b/app/views/settings/membership_actions/_form.html.erb @@ -1,4 +1,4 @@ -<%= simple_form_for(@settings_membership_action) do |f| %> +<%= simple_form_for([:settings,@settings_membership_action]) do |f| %> <%= f.error_notification %>
diff --git a/app/views/settings/membership_actions/edit.html.erb b/app/views/settings/membership_actions/edit.html.erb index 3373d008..cd5cb98a 100644 --- a/app/views/settings/membership_actions/edit.html.erb +++ b/app/views/settings/membership_actions/edit.html.erb @@ -2,5 +2,5 @@ <%= render 'form', settings_membership_action: @settings_membership_action %> -<%= link_to 'Show', @settings_membership_action %> | +<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> | <%= link_to 'Back', settings_membership_actions_path %> diff --git a/app/views/settings/membership_actions/index.html.erb b/app/views/settings/membership_actions/index.html.erb index 80b4420e..635fd34c 100644 --- a/app/views/settings/membership_actions/index.html.erb +++ b/app/views/settings/membership_actions/index.html.erb @@ -28,9 +28,9 @@ <%= settings_membership_action.merchant_account_id %> <%= settings_membership_action.created_by %> <%= settings_membership_action.additional_parameter %> - <%= link_to 'Show', settings_membership_action %> + <%= link_to 'Show', settings_membership_action_path(settings_membership_action) %> <%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %> - <%= link_to 'Destroy', settings_membership_action, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 6d7be02e..91acd6a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -85,6 +85,7 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" + get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" end diff --git a/db/migrate/20170608104900_create_settings_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb similarity index 64% rename from db/migrate/20170608104900_create_settings_membership_actions.rb rename to db/migrate/20170611084537_create_membership_actions.rb index 2b9dd85d..55f9bcb2 100644 --- a/db/migrate/20170608104900_create_settings_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -1,7 +1,7 @@ -class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] +class CreateMembershipActions < ActiveRecord::Migration[5.1] def change - create_table :settings_membership_actions do |t| - t.string :membership_type + create_table :membership_actions do |t| + t.string :membership_type t.boolean :is_active t.string :gateway_communication_type t.string :gateway_url @@ -11,6 +11,7 @@ class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1] t.string :additional_parameter t.timestamps + t.timestamps end end end diff --git a/spec/controllers/origami/redeem_payments_controller_spec.rb b/spec/controllers/origami/redeem_payments_controller_spec.rb new file mode 100644 index 00000000..22e705d7 --- /dev/null +++ b/spec/controllers/origami/redeem_payments_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::RedeemPaymentsController, type: :controller do + +end diff --git a/spec/helpers/origami/redeem_payments_helper_spec.rb b/spec/helpers/origami/redeem_payments_helper_spec.rb new file mode 100644 index 00000000..580d73ff --- /dev/null +++ b/spec/helpers/origami/redeem_payments_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::RedeemPaymentsHelper. For example: +# +# describe Origami::RedeemPaymentsHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::RedeemPaymentsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From b7bd68a461f3a16efdec5566e464650fc27c2b00 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 15:51:22 +0630 Subject: [PATCH 19/71] payment keypad --- app/assets/javascripts/origami.js | 45 +++--- app/assets/stylesheets/origami.scss | 43 +++-- app/views/origami/home/index.html.erb | 8 +- .../origami/others_payments/index.html.erb | 4 +- app/views/origami/payments/show.html.erb | 147 +++++++++--------- lib/tasks/clear_data.rake | 16 ++ 6 files changed, 148 insertions(+), 115 deletions(-) create mode 100644 lib/tasks/clear_data.rake diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 8ce3d0c4..21ec1c92 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -18,17 +18,17 @@ $(document).ready(function(){ $(".orders").on('click', function(){ - var zone_name=$(this).find(".orders-table").text(); + var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); var unique_id=$(this).find(".orders-id").text(); - var order_status=$(this).find(".orders-order-status").text().trim(); + var order_status=$(this).find(".orders-order-status").text().trim(); // Enable/Disable Button control_button(order_status); //for customer button if(unique_id.charAt(0) == 'S'){ - $("#customer").removeAttr('disabled'); + $("#customer").removeAttr('disabled'); }else{ $("#customer").attr('disabled','disabled'); } @@ -49,7 +49,7 @@ $(document).ready(function(){ type: "GET", url: "origami/" + unique_id, data: { 'id' : unique_id }, - success:function(result){ + success:function(result){ for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -78,7 +78,7 @@ $(document).ready(function(){ $("#order-grand-total").text(grand_total_amount); // Ordered Items - var order_items_rows = "" + + var order_items_rows = "" + "" + parse_data.item_name + "" + "" + parse_data.qty + "" + "" + parse_data.qty*parse_data.price + "" + @@ -94,9 +94,9 @@ $(document).ready(function(){ $(this).addClass('selected-item'); }); - // Bill Request + // Bill Request $('#request_bills').click(function() { - var order_id=$(".selected-item").find(".orders-id").text(); + var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ window.location.href = '/origami/request_bills/'+ order_id } @@ -106,16 +106,16 @@ $(document).ready(function(){ return false; }); - // Discount for Payment + // Discount for Payment $('#discount').click(function() { - var order_id=$(".selected-item").find(".orders-id").text(); + var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ window.location.href = '/origami/discount/'+ order_id } else { alert("Please select an order!"); - } - + } + return false; }); @@ -125,11 +125,11 @@ $(document).ready(function(){ var sub_total = $('#order-sub-total').text(); var grand_total = $('#order-grand-total').text(); var discount_type = $('#discount-type').val(); - var discount_value = $('#discount-amount').val(); + var discount_value = $('#discount-amount').val(); var discount_amount = discount_value; // For Percentage Discount - if(discount_type == 1){ + if(discount_type == 1){ discount_amount=(sub_total*discount_value)/100; } @@ -150,8 +150,8 @@ $(document).ready(function(){ } else { alert("Please select an order!"); - } - + } + return false; }); @@ -168,7 +168,7 @@ $(document).ready(function(){ original_value = $('#discount-amount').val(); var input_type = $(this).attr("data-type"); - + switch (input_type) { case 'num': var input_value = $(this).attr("data-value"); @@ -179,7 +179,7 @@ $(document).ready(function(){ else{ $('#discount-amount').val(original_value + '' + input_value); update_balance(); - } + } break; case 'add': @@ -210,16 +210,16 @@ $(document).ready(function(){ }); /* Button Control by Status */ -function control_button(order_status){ +function control_button(order_status){ if(order_status=="billed"){ $("#request_bills").prop('disabled', true); $("#discount").prop('disabled', false); - $("#pay").prop('disabled', false); + $("#pay-bill").prop('disabled', false); } else if(order_status=="new") { $("#request_bills").prop('disabled', false); $("#discount").prop('disabled', true); - $("#pay").prop('disabled', true); + $("#pay-bill").prop('disabled', true); } } @@ -236,9 +236,6 @@ function update_balance(){ } var total = (parseFloat(sub_total) + parseFloat(tax)) - discount_amount; - $('#order-discount').text(discount_amount); + $('#order-discount').text(discount_amount); $('#order-grand-total').text(total); } - - - diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 0be16266..c37f2678 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -7,17 +7,36 @@ // min-height: 75rem; // padding-top: 4.5rem; // } +.others-payment{ + line-height:100px; + text-align:center; + color:white; + width:300px; + height:100px; + font-size:18px; +} .cashier_number{ - height:76px; - line-height:80px; + width: 30%; + height:71px; + line-height:71px; + text-align:center; background:#54A5AF; - float:left; - margin:2px; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} + +.pay{ + width: 98%; + height:210px; + line-height:210px; + text-align:center; font-size:20px; color:white; - cursor:pointer; } .cashier_number:hover{ @@ -25,7 +44,7 @@ } .long{ - width:100% + width:49% } .sold { @@ -42,17 +61,17 @@ } .charges-name { - width: 80%; + width: 80%; text-align: left; } .item-name { - width: 60%; + width: 60%; text-align: left; } .item-attr { - width: 20%; + width: 20%; text-align: right; } @@ -70,7 +89,13 @@ background-color: #009900 } +.left{ + margin-left:1px; +} +.bottom{ + margin-bottom: 1px; +} /*----- Reset -----*/ select.form-control { diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 9e406ede..e25aebd5 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -215,13 +215,13 @@ - - + + - + - +
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index bd77effd..7ac1a145 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,10 +1,10 @@
-
+
<% @payment_method_setting.each do |payment_method|%>
-
<%= payment_method.payment_method %>
+
<%= payment_method.payment_method %>
<% end %>
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index f16ef927..4e7744f3 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -1,25 +1,35 @@
-
+
- Receipt No : <%=@sale_data.receipt_no rescue ' '%> - Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> - Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %> - Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %> + + + + + + + + + + + + + +
Receipt No : <%=@sale_data.receipt_no rescue ' '%>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>Sale Id <% if @sale_data %><%=@sale_data.sale_id %><% end %>
Customer : Default CustomerPoints : 1234
- - +
+ - - + - +
ItemsQTY - Price + ItemsQTY + Price
@@ -71,95 +81,80 @@
-
-
AMOUNT DUE
-
<%= @sale_data.grand_total %>
+
+
Amount Due
+
<%= @sale_data.grand_total %>
-
CASH
+
Cash
<%= @cash %>
-
CREDIT
+
Credit
0.0
-
OTHERS PAYMENT
+
Others Payment
0.0
-
BALANCE
+
Balance
<%= @sale_data.grand_total %>
-
-
-
-
-
-
1
-
2
-
3
-
-
-
-
1000
+ +
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
+
Del
+
Clr
-
-
-
-
4
-
5
-
6
-
+
+
+
1000
+
3000
-
-
5000
+
+
5000
+
10000
+
+
+
Pay
-
-
-
-
7
-
8
-
9
-
-
-
-
10000
-
-
-
-
-
-
0
-
.
-
00
-
-
-
-
50000
-
-
-
-
-
-
-
DEL
-
CLR
-
-
-
-
PAY
-
-
-
+ +
+
+ + +
diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake new file mode 100644 index 00000000..c9e0fe22 --- /dev/null +++ b/lib/tasks/clear_data.rake @@ -0,0 +1,16 @@ +namespace :clear do + desc "Clear Data" + task :data => :environment do + BookingOrder.delete_all + Booking.delete_all + OrderItem.delete_all + AssignedOrderItem.delete_all + Order.delete_all + SaleOrder.delete_all + SaleItem.delete_all + Sale.delete_all + SaleAudit.delete_all + SalePayment.delete_all + puts "Clear Data Done." + end +end From a8098183245190977a7db5aa4e1b23e0eef48cb1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Sun, 11 Jun 2017 16:10:50 +0630 Subject: [PATCH 20/71] other payment --- app/controllers/origami/mpu_controller.rb | 8 +++++++ app/views/origami/mpu/index.html.erb | 1 + .../origami/others_payments/index.html.erb | 21 +++++++------------ config/routes.rb | 7 ++++--- 4 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 app/controllers/origami/mpu_controller.rb create mode 100644 app/views/origami/mpu/index.html.erb diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb new file mode 100644 index 00000000..8918d705 --- /dev/null +++ b/app/controllers/origami/mpu_controller.rb @@ -0,0 +1,8 @@ +class Origami::MpuController < BaseOrigamiController + + def index + end + + def create + end +end diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb new file mode 100644 index 00000000..6b339e0f --- /dev/null +++ b/app/views/origami/mpu/index.html.erb @@ -0,0 +1 @@ +Hello MPU diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 2e0feb11..b5ef15ae 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,25 +1,20 @@
-
+
<% @payment_method_setting.each do |payment_method|%> -
- -
<%= payment_method.payment_method %>
- -
+
<%= payment_method.payment_method %>
<% end %>
-
-
diff --git a/config/routes.rb b/config/routes.rb index 91acd6a3..26c00d10 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,7 @@ require 'sidekiq/web' Rails.application.routes.draw do - + namespace :settings do resources :membership_actions end @@ -85,8 +85,9 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" - get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" - + # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" + get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index" + get 'sale/:sale_id/payment/others_payment/REDIMREBATE' => "redeem_payments#index" end #--------- Waiter/Ordering Station ------------# From 29cdcfb28d23f157ebe030355565ab4dd07ec227 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Sun, 11 Jun 2017 16:11:44 +0630 Subject: [PATCH 21/71] For Pull --- .../origami/redeem_payments_controller.rb | 31 ++++++++++------- .../origami/redeem_payments/index.html.erb | 34 +++++++++++-------- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 732f969e..fba759bb 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -1,9 +1,9 @@ class Origami::RedeemPaymentsController < BaseOrigamiController def index - sale_id = params[:sale_id] + @sale_id = params[:sale_id] payment_method = params[:payment_method] @membership_rebate_balance=0 - sale_data = Sale.find_by_sale_id(sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) @@ -12,18 +12,23 @@ class Origami::RedeemPaymentsController < BaseOrigamiController @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - puts 'Hello Hello' - puts membership_setting.to_json - member_actions =MembershipAction.find_by_membership_type("get_account_balance") - puts member_actions.to_json - url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s - puts url - - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) - if membership_data["status"]==true - @membership_rebate_balance=membership_data["balance"] - @out = true, @membership_rebate_balance,@membership_id + if membership_setting.gateway_url + member_actions =MembershipAction.find_by_membership_type("get_account_balance") + if member_actions.gateway_url + url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) + if membership_data["status"]==true + @membership_rebate_balance=membership_data["balance"] + @out = true, @membership_rebate_balance,@membership_id + end + else + @out =false,0 + end + else + @out = false,0 end + + else @out = false, 0 end diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 5e336ac4..72c09d4d 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -6,7 +6,7 @@
- +
@@ -77,12 +77,12 @@
-
DEL
-
CLR
+
DEL
+
CLR
-
PAY
+
PAY
@@ -95,9 +95,9 @@
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index b5ef15ae..4b2397a2 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -14,7 +14,6 @@ $('.others-payment').on('click',function(){ var input_type = $(this).attr("data-type"); var sale_id = $(this).attr("data-sale-id"); - alert(input_type) window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/" + input_type; }) diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 4e7744f3..d36902fb 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -93,12 +93,12 @@
Credit
-
0.0
+
0.0
Others Payment
-
0.0
+
<%= @other %>
@@ -159,6 +159,9 @@
diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 5b5d1774..74695871 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -11,7 +11,6 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.jsonb :additional_parameter t.timestamps - t.timestamps end end end diff --git a/dump.rdb b/dump.rdb index 353820066c0a3587829039db72f6c8e60a1eedaa..ebdb6db6aa4a16a1abe03b56aaa0c4d4053ff704 100644 GIT binary patch delta 213 zcmV;`04o2*ngP6>0gx~kp&C6|`UrJ%Wn?XFWo^RnV-EoS0Q(P-M};B{adl;NWjbVK zW?^+~bOFObVnMbCwgCVD3IG5AAO;^nsFN`t9s>+?Ws~tgWF=%`G%+ Date: Sun, 11 Jun 2017 17:49:06 +0630 Subject: [PATCH 26/71] payment --- app/assets/javascripts/origami.js | 2 +- app/models/sale_payment.rb | 17 +++++++---------- app/views/origami/mpu/index.html.erb | 3 ++- app/views/origami/payments/create.json.jbuilder | 1 + app/views/origami/payments/show.html.erb | 3 ++- 5 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 app/views/origami/payments/create.json.jbuilder diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 21ec1c92..e37728c1 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -20,7 +20,7 @@ $(document).ready(function(){ $(".orders").on('click', function(){ var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); - var unique_id=$(this).find(".orders-id").text(); + var unique_id = $(this).find(".orders-id").text(); var order_status=$(this).find(".orders-order-status").text().trim(); // Enable/Disable Button diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index ff4c49b6..4b6edce8 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -106,7 +106,6 @@ class SalePayment < ApplicationRecord self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! - sale_update_payment_status(self.received_amount) return payment_status @@ -205,30 +204,28 @@ class SalePayment < ApplicationRecord end def sale_update_payment_status(paid_amount) - puts "sale update" #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f - self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f - all_received_amount = 0.0 - sObj = self.sale + sObj = Sale.find(self.sale_id) sObj.sale_payments.each do |spay| - puts spay - puts spay.payment_amount all_received_amount += spay.payment_amount.to_f end - puts all_received_amount - puts self.sale.grand_total + if (self.sale.grand_total <= all_received_amount) - puts " sale update ......" self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! + rebat() end end + def rebat + + end + private def generate_custom_id self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index d82e6cd1..f082dc1a 100644 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -11,12 +11,13 @@ Amount : $('#mpu_pay').on('click',function(){ var amount = $('#amount').val(); var sale_id = "<%= @sale_id %>"; - alert(amount); + $.ajax({type: "POST", url: "<%= origami_create_mpu_payment_path %>", data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ + alert("Payment success") window.location.href = '/origami/sale/'+ sale_id + "/payment"; } } diff --git a/app/views/origami/payments/create.json.jbuilder b/app/views/origami/payments/create.json.jbuilder new file mode 100644 index 00000000..08bf292c --- /dev/null +++ b/app/views/origami/payments/create.json.jbuilder @@ -0,0 +1 @@ +json.status true diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index d36902fb..198b9518 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -229,7 +229,8 @@ $( document ).ready(function() { url: "<%= origami_payment_process_path %>", data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ - alert("THANK YOU") + alert("Thank you") + window.location.href = '/origami'; } }); } From d65882ac5bcdce934116e65b66a8a3cb34965ba3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 11 Jun 2017 18:00:34 +0630 Subject: [PATCH 27/71] crm update --- app/assets/javascripts/origami.js | 24 +++++- app/controllers/crm/customers_controller.rb | 75 ++++++++----------- .../origami/customers_controller.rb | 33 +++++++- app/controllers/origami/home_controller.rb | 20 +++++ app/models/order.rb | 6 +- app/views/crm/customers/index.html.erb | 22 ++---- app/views/crm/home/_booking.html.erb | 7 +- app/views/crm/home/index.html.erb | 4 +- app/views/origami/home/index.html.erb | 18 ++++- config/routes.rb | 12 ++- 10 files changed, 146 insertions(+), 75 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 8ce3d0c4..94d8e220 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -33,6 +33,10 @@ $(document).ready(function(){ $("#customer").attr('disabled','disabled'); } + var customer_id=$(this).find(".customer-id").text(); + show_customer_details(customer_id); + + var cashier=""; var receipt_date=""; var sub_total=0; @@ -142,6 +146,7 @@ $(document).ready(function(){ }); }); + // Payment for Bill $('#pay-bill').click(function() { var sale_id=$(".selected-item").find(".orders-id").text(); @@ -157,10 +162,27 @@ $(document).ready(function(){ $('#customer').click(function() { var sale_id=$(".selected-item").find(".orders-id").text(); - window.location.href = '/crm/customers/'+ sale_id + "/assign_sale_id" + window.location.href = '/origami/'+ sale_id + "/add_customer" + return false; }); + function show_customer_details(customer_id){ + $('.customer_detail').removeClass('hide'); + //Start Ajax + $.ajax({ + type: "GET", + url: "origami/"+customer_id+"/get_customer/", + data: {}, + dataType: "json", + success: function(data) { + $("#customer_name").text(data.name); + $("#customer_name").text(data.name); + } + }); + //End Ajax +} + /* For Receipt - Calculate discount or tax */ $('.cashier_number').on('click', function(event){ if(event.handled !== true) { diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 7896fa45..042ec63a 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -4,21 +4,23 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers # GET /crm/customers.json def index - @sale_id = 0 filter = params[:filter] if filter.nil? - @crm_customers = Customer.order("name").page(params[:page]) + @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) else @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) end #@crm_customers = Customer.all - @crm_customer = Customer.new - @membership = Customer.get_member_group - if @membership["status"] == true - @member_group = @membership["data"] - end + @crm_customer = Customer.new + @crm_customer.valid? + + + # @membership = Customer.get_member_group + # if @membership["status"] == true + # @member_group = @membership["data"] + # end respond_to do |format| format.html # index.html.erb format.json { render json: @crm_customers } @@ -49,8 +51,6 @@ class Crm::CustomersController < BaseCrmController respond_to do |format| if @crm_customers.save - - name = customer_params[:name] phone = customer_params[:contact_no] email = customer_params[:email] @@ -71,41 +71,41 @@ class Crm::CustomersController < BaseCrmController ) if response["status"] == true - puts "hhhhhhhhhhhhhhhhhh" - puts params[:sale_id] - puts response.to_json + customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - if params[:sale_id] != 0 - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } + + if params[:sale_id].nil? + + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } + else - format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: 'Customer was successfully created.' } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } end # format.json { render :index, status: :created, location: @crm_customers } else - + @crm_customers.destroy - if params[:sale_id] != 0 - format.html { redirect_to crm_customers_path, notice: response["message"] } - + if params[:sale_id].nil? + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} else - format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } + format.html { redirect_to crm_customers_path, notice: response["message"] } end end - - # format.json { render :index, status: :created, location: @crm_customers } else - if params[:sale_id] != 0 - format.html { redirect_to crm_customers_path} - format.json { render json: @crm_customers.errors, status: :unprocessable_entity } - - else - format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } - end + + if params[:sale_id].nil? + + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} + else + + format.html { redirect_to crm_customers_path} + format.json { render json: @crm_customers.errors, status: :unprocessable_entity } + end end end @@ -161,20 +161,7 @@ class Crm::CustomersController < BaseCrmController # DELETE /crm/customers/1 # DELETE /crm/customers/1.json - def get_sale_id - - @sale_id = params[:sale_id] - @crm_customers = Customer.all - @crm_customer = Customer.new - @membership = Customer.get_member_group - if @membership["status"] == true - @member_group = @membership["data"] - end - respond_to do |format| - format.html { render action: "index"} - format.json { render json: @crm_customers } - end - end + private # Use callbacks to share common setup or constraints between actions. @@ -185,7 +172,7 @@ class Crm::CustomersController < BaseCrmController # Never trust parameters from the scary internet, only allow the white list through. def customer_params - params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_type, :membership_authentication_code) + params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth) end end diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index d9bfc39b..7917b03f 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -1,7 +1,38 @@ class Origami::CustomersController < BaseOrigamiController #Form to add customer - def index + + end - def create + + # GET /crm/customers/1 + # GET /crm/customers/1.json + def show end + + + + def add_customer + + @sale_id = params[:sale_id] + filter = params[:filter] + + if filter.nil? + @crm_customers = Customer.order("name").page(params[:page]) + else + @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) + end + @crm_customer = Customer.new + @membership = Customer.get_member_group + if @membership["status"] == true + @member_group = @membership["data"] + end + respond_to do |format| + # format.html { render :template => "crm/customers/index" } + format.html { render action: "index"} + format.json { render json: @crm_customers } + end + end + + end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 9733e488..309903b2 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -3,6 +3,7 @@ class Origami::HomeController < BaseOrigamiController @booking_orders = Order.get_booking_order_table() @booking_rooms = Order.get_booking_order_rooms() @orders = Order.get_orders() + end def show @@ -25,4 +26,23 @@ class Origami::HomeController < BaseOrigamiController render :json => str.to_json end end + + def update_sale_by_customer + + sale = Sale.find(params[:sale_id]) + status = sale.update_attributes(customer_id: params[:customer_id]) + + if status == true + render json: JSON.generate({:status => true}) + else + render json: JSON.generate({:status => false, :error_message => "Record not found"}) + + end + end + + def get_customer + @customer = Customer.find(params[:customer_id]) + + render :json => @customer.to_json + end end diff --git a/app/models/order.rb b/app/models/order.rb index 4817c3ce..f4a4eff9 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -222,7 +222,7 @@ class Order < ApplicationRecord #Origami: Cashier : to view booking order Table def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.customer_id as customer_id, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") @@ -235,7 +235,7 @@ class Order < ApplicationRecord #Origami: Cashier : to view order type Room def self.get_booking_order_rooms - booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status,bookings.booking_id, + booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status,bookings.booking_id,orders.customer_id as customer_id, sales.sale_id as sale_id,dining_facilities.name as room_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") @@ -264,7 +264,7 @@ class Order < ApplicationRecord from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + orders.customer_id as customer_id,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.order_id = orders.order_id left join bookings on bookings.booking_id = booking_orders.order_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 184bce41..e4f6d07d 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -69,8 +69,10 @@
<%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + + <%= f.error_notification %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
@@ -95,24 +97,14 @@ <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%>
-
- -
- -
+
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> @@ -140,11 +132,11 @@ $(document).on('click',".checkbox_check",function(){ if(this.checked){ - var sale_id = $("#sale_id").val() || 0; + var sale_id = $("#sale_id").val() || 0; var customer_id = $(this).val(); if(sale_id != 0){ - var url = "../"+customer_id; + // var url = "/"+customer_id; update_sale(customer_id,sale_id); }else{ @@ -201,7 +193,7 @@ action: function(){ $.ajax({ type: "POST", - url: "../../update_sale/" , + url: "update_sale/" , data: {customer_id:customer_id,sale_id:sale_id}, dataType: "json", success: function(data) { diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb index 5d865002..fbe837a7 100644 --- a/app/views/crm/home/_booking.html.erb +++ b/app/views/crm/home/_booking.html.erb @@ -76,8 +76,9 @@ $(function(){ //End Print Click $('.assign').click(function(e){ - var booking_id = $(this).val() - var type = $(this).attr("data-type") + var booking_id = $(this).val(); + var type = $(this).attr("data-type"); + alert(booking_id); update_booking(booking_id,type) }); @@ -190,7 +191,7 @@ function update_booking(booking_id,type) { //Start Ajax $.ajax({ type: "POST", - url: "update_booking/" , + url: "crm/update_booking/" , data: {booking_id:booking_id,type:type}, dataType: "json", success: function(data) { diff --git a/app/views/crm/home/index.html.erb b/app/views/crm/home/index.html.erb index 87e601d9..c1938bc4 100644 --- a/app/views/crm/home/index.html.erb +++ b/app/views/crm/home/index.html.erb @@ -3,7 +3,7 @@ -
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index fa521d6c..2e8c47fb 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -37,6 +37,7 @@
    +

    <%= bko.table_name %>

    Receipt No : @@ -77,7 +78,8 @@ %>

    - + +

    <%= rmo.room_name %>

    Receipt No : @@ -118,7 +120,8 @@ %>

    - + +

    <%= odr.table_name %>

    Receipt No : @@ -162,6 +165,15 @@

    Date:

    +
    +
    +

    Customer :

    + +
    +
    +

    Amount :

    +
    +
    @@ -215,7 +227,7 @@ - + diff --git a/config/routes.rb b/config/routes.rb index 6d43e260..6fc2cf92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,7 +74,7 @@ Rails.application.routes.draw do root "home#index" get "/:booking_id" => "home#show" do #origami/:booking_id will show resources :discounts, only: [:index,:new, :create ] #add discount type - resources :customers, only: [:index,:new, :create ] #add customer type + resources :customers #add customer type end get "/request_bills/:id" => "request_bills#print" @@ -88,6 +88,12 @@ Rails.application.routes.draw do get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" + #---------Add Customer --------------# + #resources :customers + get '/:sale_id/add_customer', to: "customers#add_customer" + get '/:customer_id/get_customer' => 'home#get_customer' + post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table + end #--------- Waiter/Ordering Station ------------# @@ -102,9 +108,7 @@ Rails.application.routes.draw do root "home#index" resources :customers resources :dining_queues - get 'customers/:sale_id/assign_sale_id', to: "customers#get_sale_id", :as => "assign_sale"#get sale id with customer for crm post "update_booking" , to: "bookings#update_booking", as: "update_booking"#assign and cancel - post "update_sale" , to: "home#update_sale_by_customer"#update customer id in sale table get '/print/:id', to: "home#print_order"#print order for crm end @@ -156,6 +160,8 @@ Rails.application.routes.draw do resources :tax_profiles #lookups resources :lookups + #orders + resources :orders #cashier_terminals resources :cashier_terminals #order_job_stations From f83491158702f81c3077d3d26293874fdd824c23 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 00:45:26 +0630 Subject: [PATCH 28/71] to do req_bill_format and status changed after pay --- app/assets/javascripts/OQS.js | 33 +-- app/assets/javascripts/origami.js | 52 +++-- app/assets/stylesheets/origami.scss | 31 ++- app/controllers/oqs/home_controller.rb | 12 +- app/controllers/oqs/print_controller.rb | 34 ++-- .../origami/discounts_controller.rb | 36 ++-- app/controllers/origami/home_controller.rb | 38 +++- .../origami/request_bills_controller.rb | 14 +- app/models/order.rb | 32 ++- app/models/printer/order_queue_printer.rb | 2 +- app/models/printer/receipt_printer.rb | 7 +- app/models/sale_item.rb | 26 +++ app/pdf/order_item_pdf.rb | 51 +++-- app/pdf/order_summary_pdf.rb | 51 +++-- app/pdf/receipt_bill_pdf.rb | 127 ++++++------ app/views/origami/discounts/index.html.erb | 62 +++--- app/views/origami/home/index.html.erb | 190 +++++++++++++++--- config/routes.rb | 13 +- ...=> 20170608105644_create_dining_queues.rb} | 4 +- 19 files changed, 567 insertions(+), 248 deletions(-) rename db/migrate/{20170608105644_create_crm_dining_queues.rb => 20170608105644_create_dining_queues.rb} (59%) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 7df365ec..2cddf699 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -40,31 +40,36 @@ $(document).ready(function(){ // complete for queue item $('.order-complete').on('click',function(){ - var _self= $(this); + var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); var params = { 'id':assigned_item_id }; - var station=$(this).parent().parent(".queue_station").parent().parent().attr('id'); $.ajax({ type: 'POST', url: '/oqs/update_delivery', data: params, dataType: 'json', - success: function(data){ - var queue_station=_self.parent().parent(".queue_station"); + success: function(data){ + for (i = 0; i < data.length; i++) { + var queue_station = $('#assigned_queue_' + data[i]).parent().parent(".queue_station"); + var station = queue_station.parent().parent().attr('id'); - // Remove a queue card from current station - queue_station.remove(); + // Remove a queue card from current station + queue_station.remove(); - // Remove a queue card from current station - queue_station.children('.card-footer').remove(); - - // Add removed queue card from station to completed - $("#completed").children('.card-columns').append(queue_station); + // Remove a queue card from current station + queue_station.children('.card-footer').remove(); + + // Add removed queue card from station to completed + $("#completed").children('.card-columns').append(queue_station); - // update queue item count in station - $("#"+station+"_count").text(parseInt($("#"+station+"_count").text())-1); - $("#completed_count").text(parseInt($("#completed_count").text())+1); + // update queue item count in each station + var station_count=parseInt($("#"+station+"_count").text()) - 1; + $("#"+station+"_count").text(station_count); + } + + // update queue item count in completed station + $("#completed_count").text(parseInt($("#completed_count").text()) + data.length); alert("updated!"); } diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 61bff6e9..14d0bf6c 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -17,10 +17,13 @@ //= require cable $(document).ready(function(){ + // Enable/Disable Button + control_button("disabled"); + $(".orders").on('click', function(){ $("#order-sub-total").text(''); - $("#order-food").text(''); - $("#order-beverage").text(''); + // $("#order-food").text(''); + // $("#order-beverage").text(''); $("#order-discount").text(''); $("#order-Tax").text(''); $("#order-grand-total").text(''); @@ -53,10 +56,10 @@ $(document).ready(function(){ // AJAX call for order $.ajax({ - type: "GET", - url: "origami/" + unique_id, - data: { 'id' : unique_id }, - success:function(result){ + type: "POST", + url: "/origami/" + unique_id, + data: { 'booking_id' : unique_id }, + success:function(result){ for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -67,7 +70,7 @@ $(document).ready(function(){ receipt_date = result[i].receipt_date; $("#receipt_no").text(receipt_no); - $("#cashier").text(cashier==null?"":cashier); + $("#cashier").text(cashier == null ? "" : cashier); $("#receipt_date").text(receipt_date); @@ -79,8 +82,8 @@ $(document).ready(function(){ grand_total_amount = parse_data.grand_total_amount; $("#order-sub-total").text(sub_total); - $("#order-food").text(''); - $("#order-beverage").text(''); + // $("#order-food").text(''); + // $("#order-beverage").text(''); $("#order-discount").text(discount_amount); $("#order-Tax").text(tax_amount); $("#order-grand-total").text(grand_total_amount); @@ -106,7 +109,7 @@ $(document).ready(function(){ $('#request_bills').click(function() { var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ - window.location.href = '/origami/request_bills/'+ order_id + window.location.href = '/origami/' + order_id + '/request_bills' } else { alert("Please select an order!"); @@ -118,7 +121,7 @@ $(document).ready(function(){ $('#discount').click(function() { var order_id=$(".selected-item").find(".orders-id").text(); if(order_id!=""){ - window.location.href = '/origami/discount/'+ order_id + window.location.href = '/origami/' + order_id + '/discount' } else { alert("Please select an order!"); @@ -130,21 +133,27 @@ $(document).ready(function(){ // Pay Discount for Payment $("#pay-discount").on('click', function(){ var sale_id = $('#sale-id').text(); + var sale_item_id = $('.selected-item').attr('id'); var sub_total = $('#order-sub-total').text(); var grand_total = $('#order-grand-total').text(); var discount_type = $('#discount-type').val(); var discount_value = $('#discount-amount').val(); var discount_amount = discount_value; + if(sale_item_id == null){ + alert('Please select item row to discount!'); + return; + } + // For Percentage Discount if(discount_type == 1){ discount_amount=(sub_total*discount_value)/100; } - var params = {'sale_id': sale_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount}; + var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount}; $.ajax({ type: "POST", - url: "/origami/discount", + url: "/origami/" + sale_item_id + "/discount", data: params, success:function(result){ } }); @@ -192,8 +201,9 @@ $(document).ready(function(){ case 'add': var input_value = $(this).attr("data-value"); - amount = parseInt(input_value) + parseInt(original_value); + amount = parseInt(input_value); $('#discount-amount').val(amount); + $('#discount-type').val(1); update_balance(); break; @@ -215,6 +225,11 @@ $(document).ready(function(){ } }); + $('.discount-item-row').on('click',function(){ + $('.discount-item-row').removeClass('selected-item'); + $(this).addClass('selected-item'); + }); + }); /* Button Control by Status */ @@ -222,12 +237,17 @@ function control_button(order_status){ if(order_status=="billed"){ $("#request_bills").prop('disabled', true); $("#discount").prop('disabled', false); - $("#pay").prop('disabled', false); + $("#pay-bill").prop('disabled', false); } else if(order_status=="new") { $("#request_bills").prop('disabled', false); $("#discount").prop('disabled', true); - $("#pay").prop('disabled', true); + $("#pay-bill").prop('disabled', true); + } + else { + $("#request_bills").prop('disabled', true); + $("#discount").prop('disabled', true); + $("#pay-bill").prop('disabled', true); } } diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 0be16266..51f0c16a 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -8,9 +8,13 @@ // padding-top: 4.5rem; // } +.orders-table { + cursor: pointer; +} + .cashier_number{ - height:76px; - line-height:80px; + height:60px; + line-height:60px; text-align:center; background:#54A5AF; float:left; @@ -25,15 +29,20 @@ } .long{ - width:100% + width:100%; } .sold { background-color: red; } +.paid { + background-color: green; +} + .selected-item { - background-color: blue; + color: #fff !important; + background-color: blue !important; } /* Reciept Style */ @@ -76,3 +85,17 @@ select.form-control { height: inherit !important; } + +.form-horizontal .form-group { + margin-right: 0px !important; +} + +/* Discount */ + +.discount-item-row { + cursor: pointer; +} + +tr.discount-item-row:hover { + background-color: #e3e3e3 !important; +} \ No newline at end of file diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 2b676f21..7af42166 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -27,10 +27,18 @@ class Oqs::HomeController < BaseOqsController # update delivery status when complete click def update_delivery_status + removed_item = [] assigned_item_id = params[:id] assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_item.delivery_status=true - assigned_item.save + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + + # update delivery status for completed same order items + assigned_items.each do |ai| + ai.delivery_status=true + ai.save + removed_item.push(ai.assigned_order_item_id) + end + render :json => removed_item.to_json end # Query for OQS with status diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 8a12e439..1731f69c 100644 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -1,31 +1,39 @@ class Oqs::PrintController < ApplicationController + # Print Order Item def print unique_code="OrderItemPdf" assigned_item_id=params[:id] - assigned_order_item=AssignedOrderItem.select("order_id, item_code").where("assigned_order_item_id='" + assigned_item_id + "'") + assigned_item=AssignedOrderItem.find(assigned_item_id) + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + # print when complete click print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings,assigned_order_item[0].order_id, assigned_order_item[0].item_code ) - - # update print status when complete click - assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_item.print_status=true - assigned_item.save + order_queue_printer.print_order_item(print_settings,assigned_item.order_id, assigned_item.item_code ) + + # update print status for completed same order items + assigned_items.each do |ai| + ai.print_status=true + ai.save + end end + # Print Order Details def print_order_summary unique_code="OrderSummaryPdf" assigned_item_id=params[:id] - assigned_order_item=AssignedOrderItem.select("order_id").where('assigned_order_item_id='+assigned_item_id) + assigned_item=AssignedOrderItem.find(assigned_item_id) + assigned_items=AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + # print when complete click print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_summary(print_settings,assigned_order_item[0].order_id) + order_queue_printer.print_order_summary(print_settings,assigned_item.order_id) - # update print status when complete click - assigned_item=AssignedOrderItem.find(assigned_item_id) - assigned_item.print_status=true - assigned_item.save + # update print status for completed same order items + assigned_items.each do |ai| + ai.print_status=true + ai.save + end end end diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index daf68918..e80ca348 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -2,7 +2,7 @@ class Origami::DiscountsController < BaseOrigamiController #discount page show from origami index with selected order def index - sale_id = params[:id] + sale_id = params[:id] if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) end @@ -11,30 +11,32 @@ class Origami::DiscountsController < BaseOrigamiController #discount for selected order def create sale_id = params[:sale_id] + sale_item_id = params[:sale_item_id] discount_type = params[:discount_type] - discount_value = params[:discount_value] - discount_amount = params[:discount_amount] - grand_total = params[:grand_total] + discount_value = params[:discount_value] + discount_amount = params[:discount_amount] + grand_total = params[:grand_total] - if discount_type == 0 - remark="Discount " + discount_amount + " as net" - else - remark="Discount " + discount_amount + " as percentage" - end + if discount_type == 0 + remark="Discount " + discount_amount + " as net" + else + remark="Discount " + discount_amount + " as percentage" + end - #update discount for sale - sale = Sale.find(sale_id) - sale.total_discount = discount_amount - sale.grand_total = grand_total - sale.save + #update discount for sale + sale = Sale.find(sale_id) + sale.total_discount = sale.total_discount + discount_amount.to_f + sale.grand_total = grand_total + sale.save #save sale item for discount + origin_sale_item = SaleItem.find(sale_item_id) sale_item = SaleItem.new #pull sale_item.sale_id = sale_id - sale_item.product_code = 0 - sale_item.product_name = "Discount" + sale_item.product_code = origin_sale_item.product_code + sale_item.product_name = origin_sale_item.product_name + " Discount" sale_item.remark = remark sale_item.qty = 1 @@ -45,7 +47,7 @@ class Origami::DiscountsController < BaseOrigamiController sale_item.price = sale_item.qty * sale_item.unit_price sale_item.save - redirect_to origami_root_path + redirect_to origami_path(sale_id) end end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 9733e488..83c6bd81 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -1,28 +1,48 @@ class Origami::HomeController < BaseOrigamiController def index + if params[:booking_id] != nil + type=params[:booking_id].split('-')[0]; + # Sale + if type == "SAL" + @selected_item = Sale.find(params[:booking_id]) + @selected_item_type="Sale" + # Booking + else + @selected_item = Order.find(params[:booking_id]) + @selected_item_type="Order" + end + end + + @completed_orders = Order.get_completed_order() @booking_orders = Order.get_booking_order_table() @booking_rooms = Order.get_booking_order_rooms() @orders = Order.get_orders() - end + end - def show - str = [] - type=params[:id].split('-')[0]; + def item_show + selection(params[:booking_id],1) + end + def selection(selected_id, is_ajax) + str = [] + type=selected_id.split('-')[0]; # Sale if type == "SAL" - @order_details = SaleItem.get_order_items_details(params[:id]) + @order_details = SaleItem.get_order_items_details(params[:booking_id]) @order_details.each do |ord_detail| str.push(ord_detail) end - render :json => str.to_json # Booking else - @order_details = OrderItem.get_order_items_details(params[:id]) + @order_details = OrderItem.get_order_items_details(params[:booking_id]) @order_details.each do |ord_detail| str.push(ord_detail) - end - render :json => str.to_json + end end + if is_ajax == 1 + render :json => str.to_json + else + str + end end end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index d1aa9e61..4e884aaf 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -14,17 +14,23 @@ class Origami::RequestBillsController < BaseOrigamiController @sale_items = SaleItem.where("sale_id=?",@sale_id) else @sale_data = Sale.find_by_sale_id(check_booking.sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_id) + @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end unique_code = "ReceiptBillPdf" - customer_name = Customer.select("name").where('customer_id=' + @sale_data.customer_id) + customer= Customer.where('customer_id=' + @sale_data.customer_id) print_settings=PrintSetting.find_by_unique_code(unique_code) + # find order id by sale id + sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id) + + # Calculate Food and Beverage Total + food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items) + printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer_name) - redirect_to origami_root_path + printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total) + redirect_to origami_path(sale_order.sale_id) end end diff --git a/app/models/order.rb b/app/models/order.rb index 4817c3ce..f882e0a0 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -221,7 +221,7 @@ class Order < ApplicationRecord end #Origami: Cashier : to view booking order Table - def self.get_booking_order_table + def self.get_selected_order(id) booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") @@ -231,6 +231,32 @@ class Order < ApplicationRecord .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + end + + #Origami: Cashier : to view booking order Table + def self.get_completed_order + completed_orders = Booking.select("sales.receipt_no,orders.status as order_status, + bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("sales.sale_status='complete'") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + + end + + #Origami: Cashier : to view booking order Table + def self.get_booking_order_table + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + .joins("left join orders on orders.order_id = booking_orders.order_id") + .joins("left join sales on sales.sale_id = bookings.sale_id") + .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + end #Origami: Cashier : to view order type Room @@ -242,7 +268,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) + .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name") end @@ -271,7 +297,7 @@ class Order < ApplicationRecord left join order_items on order_items.order_id = orders.order_id left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") - .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + .where("sales.sale_status<>'complete' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id") end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index 5a0eaf25..9c928593 100644 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -40,7 +40,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker left join bookings AS b ON b.booking_id = bo.booking_id left join dining_facilities AS df ON df.id = b.dining_facility_id left join customers as cus ON cus.customer_id = orders.customer_id") - .where("orders.order_id='" + code.to_s + "'") + .where("orders.order_id='" + code + "'") .group("order_items.item_code") end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index d203568f..a8a27db3 100644 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -63,12 +63,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker self.print(filename) end -#Bill Receipt Print - def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name) + + #Bill Receipt Print + def print_receipt_bill(printer_settings,sale_items,sale_data, customer_name, food_total, beverage_total) #Use CUPS service #Generate PDF #Print - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name) + pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total) pdf.render_file "tmp/receipt_bill.pdf" self.print("tmp/receipt_bill.pdf") end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 5d87ff13..f727d184 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -29,6 +29,32 @@ class SaleItem < ApplicationRecord # return false # end end + + def self.calculate_food_beverage(sale_items) + food_prices=0 + beverage_prices=0 + + sale_items.each do |si| + food_price = get_food_price(si.sale_item_id) + beverage_price = get_beverage_price(si.sale_item_id) + + food_prices += food_price + beverage_prices += beverage_price + end + return food_prices, beverage_prices + end + + def get_food_price(sale_item_id) + food_price=SaleItem.select("sale_items.price") + .joins("left join menu_items on menu_items.item_code = sale_items.product_code") + .where("sale_items.sale_item_id=? and menu_items.account_id=0", sale_item_id) + end + + def get_beverage_price(sale_item_id) + beverage_price=SaleItem.select("sale_items.price") + .joins("left join menu_items on menu_items.item_code = sale_items.product_code") + .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id) + end private def generate_custom_id diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 3044c578..f322de64 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,29 +1,46 @@ class OrderItemPdf < Prawn::Document - + attr_accessor :receipt_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:item_description_width def initialize(order_item, print_settings) - super(:margin => [10, 5, 30, 5], :page_size => [200,400]) + self.page_width = 300 + self.page_height = 400 + self.margin = 10 + self.price_width = 50 + self.qty_width = 50 + self.item_width = self.page_width - (self.price_width + self.qty_width) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width) + self.receipt_width=130 + + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - font_size 9 - text "#{order_item.dining}", :size => 15 + # font "public/fonts/padauk.ttf" + self.header_font_size = 12 + self.item_font_size = 10 + + text "#{order_item.dining}", :size => self.header_font_size,:align => :center stroke_horizontal_rule move_down 5 #order_info - order_info(order_item.order_by,order_item.order_at, order_item.customer) + order_info(order_item.order_by,order_item.order_at) # order items order_items(order_item) end # Write Order Information to PDF - def order_info(order_by, order_at, customer) + def order_info(order_by, order_at) y_position = cursor - bounding_box([0,y_position], :width => 200, :height => 15) do - text "OrderBy:#{order_by} Customer:#{customer} Date:#{order_at.strftime("%Y-%m-%d")}", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width - 50, :height => self.item_height) do + text "OrderBy:#{order_by} ", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width - 50,y_position], :width => self.item_width + 50, :height => self.item_height) do + text "Date:#{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule @@ -35,12 +52,12 @@ class OrderItemPdf < Prawn::Document def order_items(order_item) y_position = cursor - bounding_box([0,y_position], :width => 180, :height => 15) do - text "Item", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Item", :size => self.item_font_size,:align => :left end - bounding_box([160,y_position], :width => 20, :height => 15) do - text "Qty", :size => 7,:align => :right + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "Qty", :size => self.item_font_size,:align => :right end stroke_horizontal_rule @@ -56,12 +73,12 @@ class OrderItemPdf < Prawn::Document move_down 5 - bounding_box([0,y_position], :width => 180, :height => 20) do - text "#{order_item.item_name}", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{order_item.item_name}", :size => self.item_font_size,:align => :left end - bounding_box([160,y_position], :width => 20, :height => 20) do - text "#{order_item.qty}", :size => 7,:align => :right + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "#{order_item.qty}", :size => self.item_font_size,:align => :right end move_down 5 diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 8a7a1ad9..63d75a78 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -1,19 +1,30 @@ class OrderSummaryPdf < Prawn::Document - + attr_accessor :receipt_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:item_description_width def initialize(order, print_settings) - super(:margin => [10, 5, 30, 5], :page_size => [200,400]) + self.page_width = 300 + self.page_height = 400 + self.margin = 10 + self.price_width = 60 + self.qty_width = 60 + self.item_width = self.page_width - (self.price_width + self.qty_width) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width) + self.receipt_width=130 + + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" + self.header_font_size = 12 + self.item_font_size = 10 - font_size 9 - text "#{order[0].dining}", :size => 15 + text "#{order[0].dining}", :size => self.header_font_size,:align => :center stroke_horizontal_rule move_down 5 #order_info - order_info(order[0].order_by,order[0].order_at, order[0].customer) + order_info(order[0].order_by,order[0].order_at) # order items order_items(order) @@ -21,11 +32,15 @@ class OrderSummaryPdf < Prawn::Document end # Write Order Information to PDF - def order_info(order_by, order_at, customer) + def order_info(order_by, order_at) y_position = cursor - bounding_box([0,y_position], :width => 200, :height => 15) do - text "OrderBy:#{order_by} Customer:#{customer} Date:#{order_at.strftime("%Y-%m-%d")}", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width - 20, :height => self.item_height) do + text "OrderBy:#{order_by} ", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width - 20,y_position], :width => self.item_width + 20, :height => self.item_height) do + text "Date:#{order_at.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule @@ -37,12 +52,12 @@ class OrderSummaryPdf < Prawn::Document def order_items(order_item) y_position = cursor - bounding_box([0,y_position], :width => 180, :height => 15) do - text "Item", :size => 7,:align => :left + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Item", :size => self.item_font_size,:align => :left end - bounding_box([160,y_position], :width => 20, :height => 15) do - text "Qty", :size => 7,:align => :right + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "Qty", :size => self.item_font_size,:align => :right end stroke_horizontal_rule @@ -59,13 +74,13 @@ class OrderSummaryPdf < Prawn::Document move_down 5 order_item.each do|odi| - bounding_box([0,y_position], :width => 180, :height => 20) do - text "#{odi.item_name}", :size => 7,:align => :left - end + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{odi.item_name}", :size => self.item_font_size,:align => :left + end - bounding_box([160,y_position], :width => 20, :height => 20) do - text "#{odi.qty}", :size => 7,:align => :right - end + bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do + text "#{odi.qty}", :size => self.item_font_size,:align => :right + end end move_down 5 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 5853b946..f91aebe1 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,30 +1,36 @@ class ReceiptBillPdf < Prawn::Document - attr_accessor :receipt_width,:price_column_width,:p_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_column_width,:item_description_width - def initialize(printer_settings, sale_items, sale_data, customer_name) - self.p_width = 200 + attr_accessor :receipt_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total) + self.page_width = 300 self.page_height = 1450 self.margin = 10 - # self.price_width = self.p_width / 2 - self.price_width=80 - self.item_width = self.p_width - self.price_width - self.item_height = self.item_height - self.qty_column_width = self.p_width / 2 - self.item_description_width=self.p_width - self.price_width - self.receipt_width=130 + self.price_width = 50 + self.qty_width = 30 + self.total_width = 50 + self.item_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.receipt_width=100 - @item_width = self.p_width.to_i / 2 - @qty_width = @item_width.to_i / 3 - @double = @qty_width * 1.3 - @half_qty = @qty_width / 2 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 #setting page margin and width - super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.p_width, self.page_height]) - self.header_font_size = 10 - self.item_font_size = 9 + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # font "public/fonts/#{font_name}".to_s + ".ttf".to_s + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + self.header_font_size = 12 + self.item_font_size = 10 header( printer_settings.printer_name, printer_settings.name) - stroke_horizontal_rule + + stroke_horizontal_rule + cashier_info(sale_data, customer_name) - line_items(sale_items) + line_items(sale_items, food_total, beverage_total) all_total(sale_data) @@ -38,71 +44,66 @@ class ReceiptBillPdf < Prawn::Document move_down 5 stroke_horizontal_rule - end def cashier_info(sale_data, customer_name) - move_down 5 - move_down 2 + move_down 7 + # move_down 2 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do text "Receipt No:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width, y_position], :width =>self.receipt_width) do - text "#{sale_data.receipt_no}" , :size => self.item_font_size, :align => :left + bounding_box([self.receipt_width, y_position], :width =>self.receipt_width) do + text "#{sale_data.receipt_no}" , :size => self.item_font_size, :align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do text "Customer:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([self.receipt_width,y_position], :width =>self.receipt_width) do text "#{customer_name}" , :size => self.item_font_size,:align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do text "Date:", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([self.receipt_width,y_position], :width =>self.receipt_width) do text "#{sale_data.receipt_date.strftime('%Y %m %d %h:%m')}" , :size => self.item_font_size,:align => :left end # stroke_horizontal_rule move_down 5 end - def line_items(sale_items) + def line_items(sale_items, food_total, beverage_total) y_position = cursor - qty_column_width = self.p_width * 0.2 - item_description_width = self.p_width * 0.5 - price_column_width = self.p_width * 0.3 - - stroke_horizontal_rule move_down 5 - y_position = cursor + pad_top(15) { # @item_width.to_i + @half_qty.to_i - text_box "Items", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size - text_box "Price", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Qty", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "Total", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "Items", :at =>[0,y_position], :width => self.item_width - 20, :height =>self.item_height, :size => self.item_font_size + text_box "Price", :at =>[self.item_width-20,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right + text_box "Qty", :at =>[self.item_width+self.price_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right + text_box "Total", :at =>[self.item_width+self.price_width+self.qty_width,y_position], :width => self.total_width, :height =>self.item_height, :size => self.item_font_size, :align => :right } move_down 5 stroke_horizontal_rule - add_line_item_row(sale_items) + add_line_item_row(sale_items, food_total, beverage_total) end - def add_line_item_row(sale_items) + def add_line_item_row(sale_items, food_total, beverage_total) + item_name_width = self.item_width-20 y_position = cursor move_down 5 sub_total = 0.0 @@ -119,53 +120,67 @@ class ReceiptBillPdf < Prawn::Document pad_top(15) { # @item_width.to_i + @half_qty.to_i - text_box "#{product_name}", :at =>[0,y_position], :width => @item_width.to_i - @half_qty.to_i , :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size - text_box "#{price}", :at =>[@item_width.to_i - @half_qty.to_i,y_position], :width => @qty_width, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "#{qty.to_i}", :at =>[@item_width.to_i-@qty_width,y_position], :width => @half_qty, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right - text_box "#{total_price}", :at =>[@item_width.to_i + @half_qty.to_i,y_position], :width => @double, :height =>15, :overflow => :shrink_to_fix, :size => self.item_font_size, :align => :right + text_box "#{product_name}", :at =>[0,y_position], :width => item_name_width, :height =>self.item_height, :overflow => :shrink_to_fix, :size => self.item_font_size + text_box "#{price}", :at =>[item_name_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right + text_box "#{qty.to_i}", :at =>[item_name_width+self.price_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right + text_box "#{total_price}", :at =>[item_name_width+self.price_width+self.qty_width,y_position], :width =>self.total_width, :height =>self.item_height, :size => self.item_font_size, :align => :right } move_down 3 end + stroke_horizontal_rule + move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do text "Sub Total", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do text "#{sub_total}" , :size => self.item_font_size,:align => :right end + + # Food and Beverage + food_beverage_total = food_total.to_s + '/' + beverage_total.to_s + move_down 5 + y_position = cursor + bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + text "Food/Beverage Total", :size => self.item_font_size,:align => :left + end + bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do + text "#{ food_beverage_total }" , :size => self.item_font_size,:align => :right + end end def all_total(sale_data) + item_name_width = self.item_width-20 move_down 5 - y_position =cursor + y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do text "Discount", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 - y_position =cursor + y_position = cursor - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do text "Total Tax", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor move_down 5 - bounding_box([0,y_position], :width =>self.price_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do text "Grand Total", :size => self.item_font_size,:align => :left end - bounding_box([self.price_width,y_position], :width =>self.price_width) do + bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do text "#{sale_data.grand_total}" , :size => self.item_font_size,:align => :right end move_down 5 diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index e95bdcc3..65b376d8 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -4,22 +4,22 @@
    -
    - +
    +

    Receipt No: <%=@sale_data.receipt_no rescue ' '%>

    -

    Cashier: <%=@sale_data.cashier_name rescue ' '%>

    +

    Date: <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    @@ -31,7 +31,7 @@ <% sub_total = 0 %> <% @sale_data.sale_items.each do |sale_item| %> <% sub_total += sale_item.qty*sale_item.unit_price%> - + > @@ -52,23 +52,23 @@ - + - + - + @@ -84,7 +84,7 @@
    -
    Pay Discount
    +
    Overall Discount
    @@ -108,68 +108,68 @@
    +
    +
    5%
    +
    1
    2
    3
    -
    -
    -
    500
    -
    +
    +
    +
    10%
    +
    4
    5
    6
    -
    -
    -
    1000
    -
    +
    +
    +
    20%
    +
    7
    8
    9
    -
    -
    -
    5000
    -
    +
    +
    +
    30%
    +
    0
    .
    00
    -
    -
    -
    10000
    -
    +
    +
    +
    50%
    +
    DEL
    CLR
    -
    -
    -
    50000
    -
    +
    diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index fa521d6c..350b9538 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -4,6 +4,9 @@ -
    +
    + +
    +
    + <% + @completed_orders.each do |cpo| + # Assigned Id for new Order? Sale? + unique_id="" + # For CSS- Class for Order? Sale? + sale_status="" + if cpo.order_status == 'new' + unique_id=cpo.booking_id + # check selected item and assign + if @selected_item != nil + if cpo.order_id == @selected_item.order_id + sale_status = sale_status + " selected-item" + end + end + else + unique_id=cpo.sale_id + sale_status="paid" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end + %> +
    +
    + +

    <%= cpo.table_name %>

    +

    + Receipt No : + + <%= cpo.receipt_no %> + +

    +

    + Order Status : + + <%= cpo.order_status %> + + +

    +
    +
    + <% + end + %> +
    +
    - +
    <% - @booking_orders.each do |bko| - # Assigned Id for new Order? Sale? - unique_id="" - # For CSS- Class for Order? Sale? - sale_status="" - if bko.order_status == 'new' - unique_id=bko.booking_id - else - unique_id=bko.sale_id - sale_status="sold" - end + @booking_orders.each do |bko| + # Assigned Id for new Order? Sale? + unique_id="" + # For CSS- Class for Order? Sale? + sale_status="" + if bko.order_status == 'new' + unique_id=bko.booking_id + # check selected item and assign + if @selected_item != nil + if bko.order_id == @selected_item.order_id + sale_status = sale_status + " selected-item" + end + end + else + unique_id=bko.sale_id + sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end %>
    @@ -59,8 +126,8 @@
    - -
    + +
    <% @booking_rooms.each do |rmo| @@ -69,10 +136,22 @@ # For CSS- Class for Order? Sale? sale_status="" if rmo.order_status == 'new' - unique_id=rmo.booking_id + unique_id=rmo.booking_id + # check selected item and assign + if @selected_item != nil + if rmo.order_id == @selected_item.order_id + sale_status = sale_status + " selected-item" + end + end else unique_id=rmo.sale_id sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end end %>
    @@ -100,25 +179,38 @@
    - -
    -
    + +
    +
    <% @orders.each do |odr| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? - sale_status="" + sale_status="" + if odr.order_status == 'new' unique_id=odr.booking_id + # check selected item and assign + if @selected_item != nil + if odr.order_id == @selected_item.order_id + sale_status = sale_status + " selected-item" + end + end else unique_id=odr.sale_id - sale_status="sold" - end + sale_status="sold" + # check selected item and assign + if @selected_item != nil + if unique_id == @selected_item.sale_id + sale_status = sale_status + " selected-item" + end + end + end %>
    - +

    <%= odr.table_name %>

    Receipt No : @@ -155,11 +247,11 @@

    -

    Receipt No:

    -

    Cashier:

    +

    Receipt No: <%=@selected_item.receipt_no rescue ' '%>

    +
    -

    Date:

    +

    Date: <%=@selected_item.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    @@ -172,7 +264,39 @@
    - + <% + # For Sale Items + sub_total = 0 + if @selected_item_type == "Sale" + @selected_item.sale_items.each do |sale_item| + sub_total += sale_item.qty*sale_item.unit_price + %> + + + + + + <% + end + end + %> + + <% + # For Order Items + sub_total = 0 + if @selected_item_type == "Order" + @selected_item.order_items.each do |order_item| + sub_total += order_item.qty*order_item.unit_price + %> + + + + + + <% + end + end + %>
    Items
    <%=sale_item.product_name%>@<%=sale_item.unit_price%> Sub Total: <%=sub_total%>
    Discount: (<%=@sale_data.total_discount rescue 0%>)
    <%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.qty*sale_item.price %>
    <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    @@ -180,27 +304,27 @@ - + - + - + - + - +
    Sub Total:<%=sub_total%>
    Discount:(<%=@selected_item.total_discount rescue 0%>)
    Tax:<%=@selected_item.total_tax rescue 0%>
    Grand Total:<%=@selected_item.grand_total rescue 0%>
    diff --git a/config/routes.rb b/config/routes.rb index 6d43e260..f16b8f09 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -72,14 +72,17 @@ Rails.application.routes.draw do #--------- Cashier ------------# namespace :origami do root "home#index" - get "/:booking_id" => "home#show" do #origami/:booking_id will show - resources :discounts, only: [:index,:new, :create ] #add discount type + get "/:booking_id" => "home#index" do #origami/:booking_id will show + # resources :discounts, only: [:index,:new, :create ] #add discount type resources :customers, only: [:index,:new, :create ] #add customer type end - get "/request_bills/:id" => "request_bills#print" - get "/discount/:id" => "discounts#index" - post "/discount" => "discounts#create" + post '/:booking_id' => 'home#item_show' + + get "/:id/discount" => "discounts#index" + post "/:id/discount" => "discounts#create" + + get "/:id/request_bills" => "request_bills#print" #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' diff --git a/db/migrate/20170608105644_create_crm_dining_queues.rb b/db/migrate/20170608105644_create_dining_queues.rb similarity index 59% rename from db/migrate/20170608105644_create_crm_dining_queues.rb rename to db/migrate/20170608105644_create_dining_queues.rb index 3929719e..3cf26418 100644 --- a/db/migrate/20170608105644_create_crm_dining_queues.rb +++ b/db/migrate/20170608105644_create_dining_queues.rb @@ -1,6 +1,6 @@ -class CreateCrmDiningQueues < ActiveRecord::Migration[5.1] +class CreateDiningQueues < ActiveRecord::Migration[5.1] def change - create_table :crm_dining_queues do |t| + create_table :dining_queues do |t| t.string :name t.string :contact_no t.string :queue_no From 0943808ac84ae73dc3621e68c2c2cefed8bb56e8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 00:45:59 +0630 Subject: [PATCH 29/71] finished order and sales in setting --- app/assets/javascripts/settings/orders.coffee | 3 + app/assets/stylesheets/settings/orders.scss | 3 + app/controllers/crm/customers_controller.rb | 28 +-- app/controllers/origami/home_controller.rb | 20 +- app/controllers/settings/orders_controller.rb | 32 +++ app/controllers/settings/sales_controller.rb | 42 ++++ app/helpers/settings/orders_helper.rb | 2 + .../crm/customers/_error_messages.html.erb | 9 + app/views/crm/customers/index.html.erb | 2 +- app/views/crm/customers/show.html.erb | 116 ++++++--- app/views/kaminari/_first_page.html.erb | 11 + app/views/kaminari/_gap.html.erb | 8 + app/views/kaminari/_last_page.html.erb | 11 + app/views/kaminari/_next_page.html.erb | 11 + app/views/kaminari/_page.html.erb | 12 + app/views/kaminari/_paginator.html.erb | 23 ++ app/views/kaminari/_prev_page.html.erb | 11 + app/views/origami/customers/index.html.erb | 223 ++++++++++++++++++ app/views/origami/home/index.html.erb | 9 +- app/views/settings/orders/index.html.erb | 68 ++++++ app/views/settings/orders/show.html.erb | 85 +++++++ app/views/settings/sales/index.html.erb | 85 +++++++ app/views/settings/sales/show.html.erb | 103 ++++++++ config/routes.rb | 2 + ...0170611084537_create_membership_actions.rb | 2 +- .../settings/orders_controller_spec.rb | 5 + spec/helpers/settings/orders_helper_spec.rb | 15 ++ 27 files changed, 876 insertions(+), 65 deletions(-) create mode 100644 app/assets/javascripts/settings/orders.coffee create mode 100644 app/assets/stylesheets/settings/orders.scss create mode 100644 app/controllers/settings/orders_controller.rb create mode 100644 app/controllers/settings/sales_controller.rb create mode 100644 app/helpers/settings/orders_helper.rb create mode 100644 app/views/crm/customers/_error_messages.html.erb create mode 100644 app/views/kaminari/_first_page.html.erb create mode 100644 app/views/kaminari/_gap.html.erb create mode 100644 app/views/kaminari/_last_page.html.erb create mode 100644 app/views/kaminari/_next_page.html.erb create mode 100644 app/views/kaminari/_page.html.erb create mode 100644 app/views/kaminari/_paginator.html.erb create mode 100644 app/views/kaminari/_prev_page.html.erb create mode 100644 app/views/origami/customers/index.html.erb create mode 100644 app/views/settings/orders/index.html.erb create mode 100644 app/views/settings/orders/show.html.erb create mode 100644 app/views/settings/sales/index.html.erb create mode 100644 app/views/settings/sales/show.html.erb create mode 100644 spec/controllers/settings/orders_controller_spec.rb create mode 100644 spec/helpers/settings/orders_helper_spec.rb diff --git a/app/assets/javascripts/settings/orders.coffee b/app/assets/javascripts/settings/orders.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/settings/orders.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/ diff --git a/app/assets/stylesheets/settings/orders.scss b/app/assets/stylesheets/settings/orders.scss new file mode 100644 index 00000000..436ceee1 --- /dev/null +++ b/app/assets/stylesheets/settings/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the settings/orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 8c477355..9f73edcf 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -30,6 +30,15 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers/1 # GET /crm/customers/1.json def show + @orders = Order.where("customer_id=?", params[:id]) + + if @orders + @order_items = [] + @orders.each do |bo| + @order_items = @order_items + bo.order_items + end + + end end # GET /crm/customers/new @@ -108,6 +117,7 @@ class Crm::CustomersController < BaseCrmController end end end +end # PATCH/PUT /crm/customers/1 # PATCH/PUT /crm/customers/1.json @@ -158,24 +168,6 @@ class Crm::CustomersController < BaseCrmController end end - # DELETE /crm/customers/1 - # DELETE /crm/customers/1.json - - # def get_sale_id - - # @sale_id = params[:sale_id] - # @crm_customers = Customer.all - # @crm_customer = Customer.new - # @membership = Customer.get_member_group - # if @membership["status"] == true - # @member_group = @membership["data"] - # end - # respond_to do |format| - # format.html { render action: "index"} - # format.json { render json: @crm_customers } - # end - # end - private # Use callbacks to share common setup or constraints between actions. def set_crm_customer diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 309903b2..1b16ab54 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -41,8 +41,24 @@ class Origami::HomeController < BaseOrigamiController end def get_customer - @customer = Customer.find(params[:customer_id]) - render :json => @customer.to_json + @customer = Customer.find(params[:customer_id]) + + membership = MembershipSetting.find_by_membership_type("paypar_url") + + memberaction = MembershipAction.find_by_membership_type("get_all_member_account") + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + + response = HTTParty.post(url, :body => { membership_id: @customer.membership_id}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + } + ) + + + + render :json => response.to_json end end diff --git a/app/controllers/settings/orders_controller.rb b/app/controllers/settings/orders_controller.rb new file mode 100644 index 00000000..b5bbdc1c --- /dev/null +++ b/app/controllers/settings/orders_controller.rb @@ -0,0 +1,32 @@ +class Settings::OrdersController < ApplicationController + def index + + filter = params[:filter] + if filter.nil? + orders = Order.order("order_id desc").limit(1000) + else + order = Order.where("order_id LIKE ?", "%#{filter}%").order("order_id desc").limit(1000).page(params[:page]) + if order.count > 0 + orders = order + else + orders = Order.order("order_id desc").limit(1000) + flash[:notice] = "There is no data." + end + end + @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50) + respond_to do |format| + format.html # index.html.erb + format.json { render json: @orders } + end + end + def show + + @order = Order.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.json { render json: @order } + end + end + +end diff --git a/app/controllers/settings/sales_controller.rb b/app/controllers/settings/sales_controller.rb new file mode 100644 index 00000000..6bb58244 --- /dev/null +++ b/app/controllers/settings/sales_controller.rb @@ -0,0 +1,42 @@ +class Settings::SalesController < ApplicationController + def index + + search_date = params[:date] + receipt_no = params[:receipt_no] + today = Date.today + + if receipt_no.nil? && search_date.nil? + @sales = Sale.where("NOT sale_status = 'void'" ).order("sale_id desc").limit(500) + else + if !search_date.blank? && receipt_no.blank? + sale = Sale.where("DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", search_date).order("sale_id desc").limit(500).page(params[:page]) + elsif !search_date.blank? && !receipt_no.blank? + sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page]) + else + sale = Sale.where("receipt_no LIKE ?", receipt_no).order("sale_id desc").limit(500).page(params[:page]) + end + if sale.count > 0 + @sales = sale + else + @sales = Sale.where("NOT sale_status = 'void'").order("sale_id desc").limit(500) + end + end + @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50) + respond_to do |format| + format.html # index.html.erb + format.json { render json: @sales } + end + end + + def show + + @sale = Sale.find(params[:id]) + # @sale_receivables = SaleReceivable.where('sale_id = ?', @sale.id) + respond_to do |format| + format.html # show.html.erb + format.json { render json: @sale } + end + end + + +end \ No newline at end of file diff --git a/app/helpers/settings/orders_helper.rb b/app/helpers/settings/orders_helper.rb new file mode 100644 index 00000000..f5825365 --- /dev/null +++ b/app/helpers/settings/orders_helper.rb @@ -0,0 +1,2 @@ +module Settings::OrdersHelper +end diff --git a/app/views/crm/customers/_error_messages.html.erb b/app/views/crm/customers/_error_messages.html.erb new file mode 100644 index 00000000..bbff284b --- /dev/null +++ b/app/views/crm/customers/_error_messages.html.erb @@ -0,0 +1,9 @@ +
    + +
    diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index e4f6d07d..c3fb4064 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -51,7 +51,7 @@ <%= crm_customer.contact_no %> <%= crm_customer.email %> - <%= link_to 'Destroy', crm_customer_path(crm_customer), method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to 'Show', crm_customer_path(crm_customer) %> diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index da88e887..45529dc6 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -1,40 +1,84 @@ -

    <%= notice %>

    - -

    - Name: - <%= @crm_customer.name %> -

    - -

    - Company: - <%= @crm_customer.company %> -

    - -

    - Contact no: - <%= @crm_customer.contact_no %> -

    - -

    - Email: - <%= @crm_customer.email %> -

    - -

    - Date of birth: - <%= @crm_customer.date_of_birth %> -

    +
    +
    +
      +
    1. Home
      2. +
    2. + Customer +
      3. +
    3. Details +
      4. +
    +
    +
    -

    - Membership type: - <%= @crm_customer.membership_type %> -

    +
    +
    + +
    +
    +
    + + + + + + + + + + -

    - Membership authentication code: - <%= @crm_customer.membership_authentication_code %> -

    + + + + + + + + + + +
    NameEmailContact noCompanyDate Of Birth
    <%= @crm_customer.name %><%= @crm_customer.email %><%= @crm_customer.contact_no %><%= @crm_customer.company %><%= @crm_customer.date_of_birth %>
    +
    +

    Order Details

    + + + + + + + + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + + + + + + <% end %> + +
    Created at Menu ItemQTYUnit Price OptionStatusWaiter
    <%= order_item.created_at %><%= order_item.item_name %><%= order_item.qty %><%= order_item.price %><%= order_item.options %><%= order_item.order_item_status %><%= order_item.item_order_by %>
    +
    +
    + +
    + + +
    +
    + + + -<%= link_to 'Edit', edit_crm_customer_path(@crm_customer) %> | -<%= link_to 'Back', crm_customers_path %> diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb new file mode 100644 index 00000000..2682d341 --- /dev/null +++ b/app/views/kaminari/_first_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "First" page + - available local variables + url: url to the first page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, :remote => remote %> + diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb new file mode 100644 index 00000000..bbb0f983 --- /dev/null +++ b/app/views/kaminari/_gap.html.erb @@ -0,0 +1,8 @@ +<%# Non-link tag that stands for skipped pages... + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> +<%= t('views.pagination.truncate').html_safe %> diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb new file mode 100644 index 00000000..53d61307 --- /dev/null +++ b/app/views/kaminari/_last_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Last" page + - available local variables + url: url to the last page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, :remote => remote %> + diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb new file mode 100644 index 00000000..4fc20712 --- /dev/null +++ b/app/views/kaminari/_next_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Next" page + - available local variables + url: url to the next page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.last?, t('views.pagination.next').html_safe, url, :rel => 'next', :remote => remote %> + diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb new file mode 100644 index 00000000..582af7bc --- /dev/null +++ b/app/views/kaminari/_page.html.erb @@ -0,0 +1,12 @@ +<%# Link showing page number + - available local variables + page: a page object for "this" page + url: url to this page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless page.current?, page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> + diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb new file mode 100644 index 00000000..4fb445fd --- /dev/null +++ b/app/views/kaminari/_paginator.html.erb @@ -0,0 +1,23 @@ +<%# The container tag + - available local variables + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote + paginator: the paginator that renders the pagination tags inside +-%> +<%= paginator.render do -%> + +<% end -%> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb new file mode 100644 index 00000000..9c4aff49 --- /dev/null +++ b/app/views/kaminari/_prev_page.html.erb @@ -0,0 +1,11 @@ +<%# Link to the "Previous" page + - available local variables + url: url to the previous page + current_page: a page object for the currently displayed page + total_pages: total number of pages + per_page: number of items to fetch per page + remote: data-remote +-%> + + <%= link_to_unless current_page.first?, t('views.pagination.previous').html_safe, url, :rel => 'prev', :remote => remote %> + diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb new file mode 100644 index 00000000..974dceb8 --- /dev/null +++ b/app/views/origami/customers/index.html.erb @@ -0,0 +1,223 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Customer +
      3. + +
    +
    +
    + + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + <% @crm_customers.each do |crm_customer| %> + + + + + + + + + + <% end %> + +
    + <%= form_tag crm_customers_path, :method => :get do %> +
    + + +
    + <% end %> +
    SelectNameCompanyContact noEmail
    + <%= crm_customer.name %><%= crm_customer.company %><%= crm_customer.contact_no %><%= crm_customer.email %> + <%= link_to 'Destroy', crm_customer_path(crm_customer), method: :delete, data: { confirm: 'Are you sure?' } %> + +
    +
    + + <%= paginate @crm_customers %> +
    +
    + +
    + +
    + <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> + + + + <%= f.error_notification %> + <%= f.hidden_field :id, :class => "form-control col-md-6 " %> + +
    + <%= f.input :name, :class => "form-control col-md-6 name" %> + +
    +
    + <%= f.input :company, :class => "form-control col-md-6 company" %> +
    +
    + <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %> + + +
    + +
    + <%= f.input :email, :class => "form-control col-md-6 email" %> +
    + +
    + + <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%> +
    + + + + + + +
    + <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> + <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> +
    + <%end%> +
    +
    + + + + + + + + diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 6ec5c978..459e8061 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -227,14 +227,9 @@ - -<<<<<<< HEAD - - -======= - + + ->>>>>>> 6d4ef8e2adaa39c710a9b30dcb35737b6be2410e diff --git a/app/views/settings/orders/index.html.erb b/app/views/settings/orders/index.html.erb new file mode 100644 index 00000000..bd3df8fb --- /dev/null +++ b/app/views/settings/orders/index.html.erb @@ -0,0 +1,68 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Order +
      3. + +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + + + + + <% end %> + +
    + <%= form_tag settings_orders_path, :method => :get do %> +
    + + +
    + <% end %> +
    Order ID TypeCustomerOrder statusOrder dateItems CountAction
    <%= order.order_id %><%= order.order_type %><%= order.customer.name rescue '-' %><%= order.status %> <%= order.date.strftime("%d-%m-%Y") %> <%= order.item_count %> <%= link_to 'Show', settings_order_path(order) %>
    +
    + + <%= paginate @orders %> +
    +
    + +
    +
    + + + + + diff --git a/app/views/settings/orders/show.html.erb b/app/views/settings/orders/show.html.erb new file mode 100644 index 00000000..bd17dadb --- /dev/null +++ b/app/views/settings/orders/show.html.erb @@ -0,0 +1,85 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Order +
      3. +
    3. + <%= @order.order_id %> +
      4. +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    TypeCustomerOrder statusOrder dateOrder By
    <%= @order.order_type %><%= @order.customer.name rescue '-' %><%= @order.status %> <%= @order.date.strftime("%d-%m-%Y") %> <%= @order.waiter rescue '-' %>
    +

    Order Items

    + + + + + + + + + + + + + + + + + <% @order.order_items.each do |order| %> + + + + + + + + + + + + <% end %> + +
    Item NameQty Unit PriceTotal PriceOptionStatusOrder ByCreated at
    <%= order.item_name %><%= order.qty %><%= order.price %><%= order.qty * order.price %> <%= order.options %> <%= order.order_item_status %> <%= order.item_order_by %> <%= order.created_at.strftime("%d-%m-%Y") %>
    + + Back + +
    +
    + +
    +
    + + + + + diff --git a/app/views/settings/sales/index.html.erb b/app/views/settings/sales/index.html.erb new file mode 100644 index 00000000..c53a6e8d --- /dev/null +++ b/app/views/settings/sales/index.html.erb @@ -0,0 +1,85 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. + +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + <% @sales.each do |sale| %> + + + + + + + + + + + + <% end %> + +
    + <%= form_tag settings_sales_path, :method => :get do %> +
    + + + + +
    + <% end %> +
    Sale Id Receipt no Grand totalTax amountCashierSales statusReceipt DateAction
    <%= sale.sale_id %><%= sale.receipt_no %><%= sale.grand_total rescue '-' %><%= sale.total_tax %><%= sale.cashier_name rescue '-' %> <%= sale.sale_status %> <%= sale.receipt_date.strftime("%d-%m-%Y") %> <%= link_to 'Show', settings_sale_path(sale) %>
    +
    + + <%= paginate @sales %> +
    +
    + +
    +
    + + + + + + + diff --git a/app/views/settings/sales/show.html.erb b/app/views/settings/sales/show.html.erb new file mode 100644 index 00000000..484de762 --- /dev/null +++ b/app/views/settings/sales/show.html.erb @@ -0,0 +1,103 @@ +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. +
    3. + <%= @sale.sale_id %> +
      4. +
    +
    +
    +
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + <% @sale.sale_items.each do |s| %> + + + + + + + + + <% end %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Receipt Date Receipt noCashierOSales statusReceipt generated at
    <%= @sale.receipt_date.strftime("%d-%M-%Y") %><%= @sale.receipt_no %><%= @sale.cashier rescue '-' %> <%= @sale.sale_status %> <%= @sale.requested_at.strftime("%d-%m-%Y") %>
    Sale item name QtyUnit priceTotal pirce Created at
    <%=s.product_name rescue ' '%><%=s.qty rescue ' '%><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%><%= number_with_precision(s.qty * s.price, :precision => 2, :delimiter => ',') rescue ' '%><%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %>
    Total<%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%>
    Tax<%= number_with_precision(@sale.total_tax, :precision => 2, :delimiter => ',') rescue ' '%>
    Discount<%= number_with_precision(@sale.total_discount, :precision => 2, :delimiter => ',') rescue ' '%>
    Grand Total<%= number_with_precision(@sale.grand_total, :precision => 2, :delimiter => ',') rescue ' '%>
     
    Pay Amount<%= number_with_precision(@sale.amount_received, :precision => 2, :delimiter => ',') rescue ' '%>
    Change<%= number_with_precision(@sale.amount_changed, :precision => 2, :delimiter => ',') rescue ' '%>
    + + + Back + +
    +
    + +
    +
    + + + + + diff --git a/config/routes.rb b/config/routes.rb index 2c9be9e0..7dff2ad3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -166,6 +166,8 @@ Rails.application.routes.draw do resources :lookups #orders resources :orders + #sales + resources :sales #cashier_terminals resources :cashier_terminals #order_job_stations diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 74695871..4a164add 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -8,7 +8,7 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.string :auth_token t.string :merchant_account_id t.string :created_by - t.jsonb :additional_parameter + t.string :additional_parameter,array: true, :default =>'{}' t.timestamps end diff --git a/spec/controllers/settings/orders_controller_spec.rb b/spec/controllers/settings/orders_controller_spec.rb new file mode 100644 index 00000000..e715e84f --- /dev/null +++ b/spec/controllers/settings/orders_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Settings::OrdersController, type: :controller do + +end diff --git a/spec/helpers/settings/orders_helper_spec.rb b/spec/helpers/settings/orders_helper_spec.rb new file mode 100644 index 00000000..028e7209 --- /dev/null +++ b/spec/helpers/settings/orders_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Settings::OrdersHelper. For example: +# +# describe Settings::OrdersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Settings::OrdersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From 137267514b4e4c56ac47573e9e37fdfdb76bac53 Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 12 Jun 2017 07:21:09 +0630 Subject: [PATCH 30/71] bundle gemlock --- Gemfile.lock | 2 -- 1 file changed, 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fbf61a33..8780a375 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -257,8 +257,6 @@ DEPENDENCIES jquery-rails kaminari! listen (~> 3.0.5) - pg - mysql2 (>= 0.3.18, < 0.5) prawn prawn-table puma (~> 3.0) From 7eaea8f08d3299c058cc6df70323415a0736fd5d Mon Sep 17 00:00:00 2001 From: Min Zeya Phyo Date: Mon, 12 Jun 2017 07:40:40 +0630 Subject: [PATCH 31/71] fixed jsonb to json to support both mysql and postgres --- db/migrate/20170611084537_create_membership_actions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20170611084537_create_membership_actions.rb b/db/migrate/20170611084537_create_membership_actions.rb index 74695871..c980ceac 100644 --- a/db/migrate/20170611084537_create_membership_actions.rb +++ b/db/migrate/20170611084537_create_membership_actions.rb @@ -8,7 +8,7 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1] t.string :auth_token t.string :merchant_account_id t.string :created_by - t.jsonb :additional_parameter + t.json :additional_parameter t.timestamps end From 3f3d37756dade885abf6d0b462dc0627f6e8b28f Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 09:20:38 +0630 Subject: [PATCH 32/71] update --- app/models/sale_payment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 8dea66a3..6609a28e 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -222,7 +222,7 @@ class SalePayment < ApplicationRecord end def rebat - + end private From 121fb92b9b35d924f666f1b938c412d8ba938199 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 10:12:55 +0630 Subject: [PATCH 33/71] update orgami js --- app/assets/javascripts/origami.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 0838e1a2..5626634f 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -56,17 +56,16 @@ $(document).ready(function(){ // AJAX call for order $.ajax({ -<<<<<<< HEAD type: "POST", url: "/origami/" + unique_id, data: { 'booking_id' : unique_id }, success:function(result){ -======= - type: "GET", - url: "origami/" + unique_id, - data: { 'id' : unique_id }, - success:function(result){ ->>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77 +// ======= +// type: "GET", +// url: "origami/" + unique_id, +// data: { 'id' : unique_id }, +// success:function(result){ +// >>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77 for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -250,14 +249,11 @@ function control_button(order_status){ $("#request_bills").prop('disabled', false); $("#discount").prop('disabled', true); $("#pay-bill").prop('disabled', true); -<<<<<<< HEAD } else { $("#request_bills").prop('disabled', true); $("#discount").prop('disabled', true); $("#pay-bill").prop('disabled', true); -======= ->>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77 } } From e1481eb591723dbb6cc45ece4b23db3b2454bbf6 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 10:27:53 +0630 Subject: [PATCH 34/71] update route after merge with crm --- config/routes.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 8fe3992f..4fd158b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -72,15 +72,9 @@ Rails.application.routes.draw do #--------- Cashier ------------# namespace :origami do root "home#index" -<<<<<<< HEAD - get "/:booking_id" => "home#index" do #origami/:booking_id will show - # resources :discounts, only: [:index,:new, :create ] #add discount type - resources :customers, only: [:index,:new, :create ] #add customer type -======= get "/:booking_id" => "home#show" do #origami/:booking_id will show - resources :discounts, only: [:index,:new, :create ] #add discount type + # resources :discounts, only: [:index,:new, :create ] #add discount type resources :customers #add customer type ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 end post '/:booking_id' => 'home#item_show' @@ -96,12 +90,10 @@ Rails.application.routes.draw do post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" -<<<<<<< HEAD # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index" post 'create_mpu_payment' => "mpu#create" get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index" -======= #---------Add Customer --------------# #resources :customers @@ -109,7 +101,6 @@ Rails.application.routes.draw do get '/:customer_id/get_customer' => 'home#get_customer' post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 end #--------- Waiter/Ordering Station ------------# From b6bba9ecd416d47cd880bb89d52160669c6863be Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 10:55:04 +0630 Subject: [PATCH 35/71] merge conflict --- app/controllers/origami/home_controller.rb | 5 ---- app/views/origami/home/index.html.erb | 29 +++++++--------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 4c97c80e..669c8a7f 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -17,12 +17,7 @@ class Origami::HomeController < BaseOrigamiController @booking_orders = Order.get_booking_order_table() @booking_rooms = Order.get_booking_order_rooms() @orders = Order.get_orders() -<<<<<<< HEAD end -======= - - end ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 def item_show selection(params[:booking_id],1) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 426d0533..394d494b 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -25,6 +25,7 @@
    <% @completed_orders.each do |cpo| + # ToDo no need check new # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? @@ -50,13 +51,9 @@ %>
    - -<<<<<<< HEAD -

    <%= cpo.table_name %>

    -======= + -

    <%= bko.table_name %>

    ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 +

    <%= cpo.table_name %>

    Receipt No : @@ -162,14 +159,10 @@ %>

    -<<<<<<< HEAD -

    <%= rmo.room_name %>

    -======= - - -

    <%= rmo.room_name %>

    ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 + +

    <%= rmo.room_name %>

    +

    Receipt No : @@ -222,14 +215,10 @@ %>

    -<<<<<<< HEAD - -

    <%= odr.table_name %>

    -======= - + -

    <%= odr.table_name %>

    ->>>>>>> d65882ac5bcdce934116e65b66a8a3cb34965ba3 +

    <%= odr.table_name %>

    +

    Receipt No : From ca2dc181d62c8c15e0072d7ad01720fb19d28531 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 12:04:12 +0630 Subject: [PATCH 36/71] add receipt no report and bug fixing --- app/controllers/reports/receipt_no_controller.rb | 9 +++++++++ app/models/order.rb | 6 +++--- app/models/sale_item.rb | 14 +++++++------- app/views/reports/receipt_no/index.html.erb | 3 +++ config/routes.rb | 13 +++++++------ 5 files changed, 29 insertions(+), 16 deletions(-) create mode 100644 app/controllers/reports/receipt_no_controller.rb create mode 100644 app/views/reports/receipt_no/index.html.erb diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb new file mode 100644 index 00000000..05065fee --- /dev/null +++ b/app/controllers/reports/receipt_no_controller.rb @@ -0,0 +1,9 @@ +class Reports::ReceiptNoController < BaseReportController + def index + @hi = "hi" + end + + def show + + end +end \ No newline at end of file diff --git a/app/models/order.rb b/app/models/order.rb index 5e123060..a165b7b4 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -241,7 +241,7 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status='complete'") + .where("sales.sale_status='completed'") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") end @@ -254,7 +254,7 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") end @@ -268,7 +268,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) + .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name") end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index f727d184..0aed9a23 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -35,22 +35,22 @@ class SaleItem < ApplicationRecord beverage_prices=0 sale_items.each do |si| - food_price = get_food_price(si.sale_item_id) - beverage_price = get_beverage_price(si.sale_item_id) - - food_prices += food_price - beverage_prices += beverage_price + food_price = self.get_food_price(si.sale_item_id) + beverage_price = self.get_beverage_price(si.sale_item_id) +puts food_price + # food_prices = food_prices + food_price.price + # beverage_prices = beverage_prices + beverage_price.price end return food_prices, beverage_prices end - def get_food_price(sale_item_id) + def self.get_food_price(sale_item_id) food_price=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") .where("sale_items.sale_item_id=? and menu_items.account_id=0", sale_item_id) end - def get_beverage_price(sale_item_id) + def self.get_beverage_price(sale_item_id) beverage_price=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id) diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb new file mode 100644 index 00000000..0bae50e7 --- /dev/null +++ b/app/views/reports/receipt_no/index.html.erb @@ -0,0 +1,3 @@ +

    + <%= @hi %> +
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4fd158b8..0666e0c4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -197,12 +197,13 @@ Rails.application.routes.draw do #--------- Reports Controller Sections ------------# namespace :reports do - resources :sales, :only => [:index, :show] - resources :orders, :only => [:index, :show] - resources :customers, :only => [:index, :show] - resources :products, :only => [:index, :show] - resources :inventory, :only => [:index, :show] - resources :employees, :only => [:index, :show] + resources :receipt_no, :only => [:index, :show] + # resources :sales, :only => [:index, :show] + # resources :orders, :only => [:index, :show] + # resources :customers, :only => [:index, :show] + # resources :products, :only => [:index, :show] + # resources :inventory, :only => [:index, :show] + # resources :employees, :only => [:index, :show] end #mount_compendium at: '/report' #, controller: 'reports' From ee208a5dcdd9401bc7ba13b9cc04e2c53b7f5772 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 13:26:09 +0630 Subject: [PATCH 37/71] Update --- app/assets/stylesheets/origami.scss | 13 ++--- app/controllers/api/orders_controller.rb | 5 +- app/models/dining_facility.rb | 5 +- app/models/order.rb | 16 +++--- app/models/sale_payment.rb | 4 +- app/views/origami/discounts/index.html.erb | 62 +++++++++++----------- app/views/origami/payments/show.html.erb | 9 ++-- 7 files changed, 60 insertions(+), 54 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 9e886d87..5e361f7e 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -21,8 +21,9 @@ } .cashier_number{ - height:60px; - line-height:60px; + width: 33%; + height:70px; + line-height:70px; text-align:center; background:#54A5AF; // float:left; @@ -34,8 +35,8 @@ .pay{ width: 98%; - height:210px; - line-height:210px; + height:211px; + line-height:211px; text-align:center; font-size:20px; color:white; @@ -46,7 +47,7 @@ } .long{ - width:100%; + width:49%; } .sold { @@ -121,4 +122,4 @@ select.form-control { tr.discount-item-row:hover { background-color: #e3e3e3 !important; -} \ No newline at end of file +} diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index df9b1542..8bd348e2 100644 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -38,9 +38,8 @@ class Api::OrdersController < Api::ApiController #Create Table Booking or Room Booking - if !params["booking_id"].nil? && params[:booking_id].to_i > 0 - #@order.new_booking = false - @order.new_booking = true + if !params["booking_id"].nil? + @order.new_booking = false @order.booking_id = params[:booking_id] end diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 9a4f7a75..a3f8948f 100644 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -9,10 +9,11 @@ class DiningFacility < ApplicationRecord scope :active, -> {where(is_active: true)} def get_current_booking - booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='occupied' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) + puts "enter booking" + booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) if booking.count > 0 then - return booking[0] + return booking[0].booking_id else return nil end diff --git a/app/models/order.rb b/app/models/order.rb index 5e123060..9dcd6949 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -28,11 +28,13 @@ class Order < ApplicationRecord booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", :checkin_at => Time.now.utc, :checkin_by => self.employee_name, :booking_status => "assign" }) + table = DiningFacility.find(self.table_id) + table.status = "occupied" + table.save else if (self.booking_id.to_i > 0 ) booking = Booking.find(self.booking_id) end - end booking.save! @@ -226,7 +228,7 @@ class Order < ApplicationRecord bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .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") .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") @@ -239,10 +241,10 @@ class Order < ApplicationRecord bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .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") .where("sales.sale_status='complete'") - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id") end @@ -252,7 +254,7 @@ class Order < ApplicationRecord bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .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") .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") @@ -269,7 +271,7 @@ class Order < ApplicationRecord .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") end #Origami: Cashier : to view order type Room @@ -298,7 +300,7 @@ class Order < ApplicationRecord left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") .where("sales.sale_status<>'complete' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) - .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id") + .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id") end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 6609a28e..27ddafa6 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -211,18 +211,18 @@ class SalePayment < ApplicationRecord sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f end - if (self.sale.grand_total <= all_received_amount) self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! + #TODO: table status rebat() end end def rebat - + end private diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 65b376d8..4f6b7c9a 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -4,7 +4,7 @@
    -
    @@ -13,10 +13,10 @@

    Receipt No: <%=@sale_data.receipt_no rescue ' '%>

    -
    +

    Date: <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

    -
    +
    @@ -75,7 +75,7 @@
    -
    +
    @@ -88,7 +88,7 @@
    -
    +
    - -
    -
    + +
    +
    -
    +
    -
    +
    5%
    -
    +
    1
    -
    2
    -
    3
    +
    2
    +
    3
    -
    +
    @@ -125,12 +125,12 @@
    10%
    -
    +
    4
    -
    5
    -
    6
    +
    5
    +
    6
    -
    +
    @@ -138,12 +138,12 @@
    20%
    -
    +
    7
    -
    8
    -
    9
    +
    8
    +
    9
    -
    +
    @@ -151,12 +151,12 @@
    30%
    -
    +
    0
    -
    .
    -
    00
    +
    .
    +
    00
    -
    +
    @@ -166,13 +166,13 @@
    -
    DEL
    -
    CLR
    +
    DEL
    +
    CLR
    -
    +
    -
+
-
+
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 198b9518..e8d35206 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -130,7 +130,7 @@
00
-
+
Nett
Del
Clr
@@ -195,6 +195,10 @@ $(document).on('click', '.cashier_number', function(event){ $('#cash').text("0.0"); update_balance(); break; + case 'nett': + $('#cash').text($('#amount_due').text()); + update_balance(); + break; } event.handled = true; } else { @@ -216,7 +220,6 @@ $( document ).ready(function() { }); $('#pay').click(function() { - if($('#balance').text() > 0){ alert(" Insufficient Amount!") }else{ @@ -230,7 +233,7 @@ $( document ).ready(function() { data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ alert("Thank you") - window.location.href = '/origami'; + // window.location.href = '/origami'; } }); } From a96444518a7526fbb342bc7abba4870e986d9f79 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 13:28:16 +0630 Subject: [PATCH 38/71] fixed conflict --- app/models/order.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 27fa8247..a76159be 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -243,13 +243,10 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") -<<<<<<< HEAD - .where("sales.sale_status='complete'") - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id") -======= + .where("sales.sale_status='completed'") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") ->>>>>>> ca2dc181d62c8c15e0072d7ad01720fb19d28531 + end From c6b72a112b73616bc323391a8dd7d3ec047d88cf Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 13:31:01 +0630 Subject: [PATCH 39/71] For Pull --- dump.rdb | Bin 20156 -> 20365 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dump.rdb b/dump.rdb index ebdb6db6aa4a16a1abe03b56aaa0c4d4053ff704..0e6392847a8e41d0312e82639916e8eec64d12a8 100644 GIT binary patch delta 394 zcmWm7y=qiJ6ae74yF?dO1-H>6cvp!a$SiYa&Y3f_5O4!_VlNhE=FSX)#6n{uglJ_I zFx)gE`Dw%;Tnoic8w;Pqi%(!BSOm=reBamoYUi+etuB7Lv3l?C=-Jbp!**z!fQYJc_-j>(yC;31c;QQB5*bYY9`+Nr-z1T_SQ{7r_Ja2;Q5`=!R{Lz9K5{y E4{QT>lmGw# delta 159 zcmV;Q0AT-(p8>p`0gx~ep&C6|`UrJ%Wn?XFWo^RnW066d5;-fi51C3;}49wE`an17c=3F_Ta+C6m1Y3zIA@FhXFU7cwwrWj8oAF*GzaWnwTj zF*r71VKrkpGa!@~V{&C-bY)~;VRRxoF*G?hF*i0hGdC_aKq~+>AZq|_V71^2vkL=y NOb9(%2Jyx?=AoT9F%|#- From 917ccd0294737ae459dc180240022471024568e0 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 13:48:54 +0630 Subject: [PATCH 40/71] booking update --- app/models/order.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index a76159be..4526ce35 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -25,6 +25,7 @@ class Order < ApplicationRecord booking = nil if self.new_booking + puts "a" booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking", :checkin_at => Time.now.utc, :checkin_by => self.employee_name, :booking_status => "assign" }) @@ -32,9 +33,10 @@ class Order < ApplicationRecord table.status = "occupied" table.save else - if (self.booking_id.to_i > 0 ) + puts "b" + booking = Booking.find(self.booking_id) - end + end booking.save! @@ -243,7 +245,6 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status='completed'") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") @@ -272,7 +273,6 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") From a2111f16355607559c3de5ce07e0c555e0227378 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 13:58:16 +0630 Subject: [PATCH 41/71] For Pull --- app/models/order.rb | 2 -- dump.rdb | Bin 20365 -> 20467 bytes 2 files changed, 2 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index a76159be..702855cc 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -243,7 +243,6 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status='completed'") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") @@ -272,7 +271,6 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") diff --git a/dump.rdb b/dump.rdb index 0e6392847a8e41d0312e82639916e8eec64d12a8..9a81a61e209e6152e39a6f20ab56fb2fd13d5afc 100644 GIT binary patch delta 324 zcmV-K0lWT;_R`UrJ%Wn?XFWo^PRYLP*l5t&B7AHW6x01yQL00aO4 zL8p^}E)$bQ15T4q0V5?5H!(G4HaIjeEn;LeWi2#jIW-^&4l*+>GBIUiG-PFCVq`fm zlTa}wlf3~8lPoPTPhg-IWH>oCIAUfwH!)%|VrDZpGiEU~Wiw(oAe0zma%Ew3Wn^Dr zbRs%2G&wgiH8C|dH!d(VAP4|4AZq|_V71^29|kuuF@6530pX~vlX3wjM;+2NDGU0Ad3G03ZS% zL8p_EDjow2bY+v#L}Zgk0wt4LMJ1EG0SlAJJTOjRpci9hHDNJkH!v_VVrDR6WjA3r zHa0Y5Gch2P9Ak22VRU6=Utx42Ix#dkH!(LhH#IOWGdMFfHaQ?`0B&Hl;0qrHH!w1N z{;C1tsFSk-DFk5m;Wd-q0y8`XGBh)N{;ol-0I1`oTOVRHF*P Date: Mon, 12 Jun 2017 14:11:13 +0630 Subject: [PATCH 42/71] updated for food and beverage bugs --- app/assets/javascripts/origami.js | 34 ++++++++++-------------- app/models/sale_item.rb | 17 ++++++------ app/views/origami/payments/show.html.erb | 1 - config/routes.rb | 2 +- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 14f9fbe9..d3ac9e76 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -64,12 +64,6 @@ $(document).ready(function(){ url: "/origami/" + unique_id, data: { 'booking_id' : unique_id }, success:function(result){ -// ======= -// type: "GET", -// url: "origami/" + unique_id, -// data: { 'id' : unique_id }, -// success:function(result){ -// >>>>>>> 5ee3ae257a59269b651dcc5c0232b95d7f41fb77 for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -191,20 +185,20 @@ $(document).ready(function(){ }); function show_customer_details(customer_id){ - $('.customer_detail').removeClass('hide'); - //Start Ajax - $.ajax({ - type: "GET", - url: "origami/"+customer_id+"/get_customer/", - data: {}, - dataType: "json", - success: function(data) { - $("#customer_name").text(data.name); - $("#customer_name").text(data.name); - } - }); - //End Ajax -} + $('.customer_detail').removeClass('hide'); + //Start Ajax + $.ajax({ + type: "GET", + url: "origami/"+customer_id+"/get_customer/", + data: {}, + dataType: "json", + success: function(data) { + $("#customer_name").text(data.name); + $("#customer_name").text(data.name); + } + }); + //End Ajax + } /* For Receipt - Calculate discount or tax */ $('.cashier_number').on('click', function(event){ diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 0aed9a23..25b37178 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -36,24 +36,25 @@ class SaleItem < ApplicationRecord sale_items.each do |si| food_price = self.get_food_price(si.sale_item_id) - beverage_price = self.get_beverage_price(si.sale_item_id) -puts food_price - # food_prices = food_prices + food_price.price - # beverage_prices = beverage_prices + beverage_price.price + beverage_price = self.get_beverage_price(si.sale_item_id) + food_prices = food_prices + food_price + beverage_prices = beverage_prices + beverage_price end return food_prices, beverage_prices end def self.get_food_price(sale_item_id) - food_price=SaleItem.select("sale_items.price") + food=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") - .where("sale_items.sale_item_id=? and menu_items.account_id=0", sale_item_id) + .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id.to_s) + food_price = food[0].price rescue 0 end def self.get_beverage_price(sale_item_id) - beverage_price=SaleItem.select("sale_items.price") + beverage=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") - .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id) + .where("sale_items.sale_item_id=? and menu_items.account_id=2", sale_item_id.to_s) + beverage_price = beverage[0].price rescue 0 end private diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 198b9518..f52c99a1 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -216,7 +216,6 @@ $( document ).ready(function() { }); $('#pay').click(function() { - if($('#balance').text() > 0){ alert(" Insufficient Amount!") }else{ diff --git a/config/routes.rb b/config/routes.rb index 0666e0c4..ddb6e3ff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -72,7 +72,7 @@ Rails.application.routes.draw do #--------- Cashier ------------# namespace :origami do root "home#index" - get "/:booking_id" => "home#show" do #origami/:booking_id will show + get "/:booking_id" => "home#index" do #origami/:booking_id will show # resources :discounts, only: [:index,:new, :create ] #add discount type resources :customers #add customer type end From dd5de68bc0769804de7fd9f4a19762a6b30cb453 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 14:16:31 +0630 Subject: [PATCH 43/71] Seed --- db/seeds.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index fe7bdcc7..5cd38d12 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -51,6 +51,10 @@ menu_item_type = Lookup.create([{lookup_type:'menu_item_type', name: 'SIMPLE', v {lookup_type:'menu_item_type', name: 'Set Menu', value: 'setMenu'}, {lookup_type:'menu_item_type', name: 'DIY', value: 'diy'}]) +member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Platinum', value: '1'}, + {lookup_type:'member_group_type', name: 'Silver', value: '2'} + ]) + #menu_item_attribute:[size|] menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type', name: 'Size', value: 'size'}]) # {lookup_type:'menu_item_attribute_type', name: 'Spicy', value: 'spicy'}, @@ -141,7 +145,7 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "192.168.1."}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"}) member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}}, {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}}, @@ -151,6 +155,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"} ]) +payment_methods = PaymentMethodSetting.create({membership_type:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"}) # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", From b0eb92b04323ad016aad7a8dd978e6b72f89b070 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 14:19:04 +0630 Subject: [PATCH 44/71] Seed --- db/seeds.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds.rb b/db/seeds.rb index 5cd38d12..ae2d617d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -155,7 +155,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"} ]) -payment_methods = PaymentMethodSetting.create({membership_type:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"}) # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", From c7ff5140d4929a8674e7b00baa4d59bf60a58db2 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 14:22:45 +0630 Subject: [PATCH 45/71] Payment route change --- app/views/origami/mpu/index.html.erb | 2 +- app/views/origami/payments/show.html.erb | 2 +- config/routes.rb | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index f082dc1a..7b483a75 100644 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -13,7 +13,7 @@ Amount : var sale_id = "<%= @sale_id %>"; $.ajax({type: "POST", - url: "<%= origami_create_mpu_payment_path %>", + url: "<%= origami_payment_mpu_path %>", data: "amount="+ amount + "&sale_id="+ sale_id, success:function(result){ if(result){ diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index e8d35206..7eb890f4 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -229,7 +229,7 @@ $( document ).ready(function() { var card = $('#card').text(); var sale_id = $('#sale_id').text(); $.ajax({type: "POST", - url: "<%= origami_payment_process_path %>", + url: "<%= origami_payment_cash_path %>", data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ alert("Thank you") diff --git a/config/routes.rb b/config/routes.rb index ddb6e3ff..6337f4ee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,17 +82,17 @@ Rails.application.routes.draw do get "/:id/discount" => "discounts#index" post "/:id/discount" => "discounts#create" - get "/:id/request_bills" => "request_bills#print" + get "/:id/request_bills" => "request_bills#print" #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' - post 'payment_process' => 'payments#create' + post 'payment/cash' => 'payments#create' post 'paypar_payment_process' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index" get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index" - post 'create_mpu_payment' => "mpu#create" + post 'payment/mpu' => "mpu#create" get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index" #---------Add Customer --------------# @@ -167,7 +167,7 @@ Rails.application.routes.draw do resources :tax_profiles #lookups resources :lookups - #orders + #orders resources :orders #cashier_terminals resources :cashier_terminals From b12b52d75454d60003bbc7cbd513a21cd601c5c1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 14:23:18 +0630 Subject: [PATCH 46/71] update table status --- app/models/order.rb | 5 +---- app/models/sale_payment.rb | 6 +++++- config/routes.rb | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 4526ce35..40bfbcb7 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -33,10 +33,7 @@ class Order < ApplicationRecord table.status = "occupied" table.save else - puts "b" - - booking = Booking.find(self.booking_id) - + booking = Booking.find(self.booking_id) end booking.save! diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 27ddafa6..5dff91b9 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -215,12 +215,16 @@ class SalePayment < ApplicationRecord self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! - #TODO: table status + table_update_status() rebat() end end + def table_update_status + + end + def rebat end diff --git a/config/routes.rb b/config/routes.rb index 0666e0c4..ddf7d9cd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -82,7 +82,7 @@ Rails.application.routes.draw do get "/:id/discount" => "discounts#index" post "/:id/discount" => "discounts#create" - get "/:id/request_bills" => "request_bills#print" + get "/:id/request_bills" => "request_bills#print" #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' @@ -167,7 +167,7 @@ Rails.application.routes.draw do resources :tax_profiles #lookups resources :lookups - #orders + #orders resources :orders #cashier_terminals resources :cashier_terminals From e90178cfdcf505d9e27812eaefd1abc8a51519db Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 14:23:20 +0630 Subject: [PATCH 47/71] finished CRM and customer --- app/assets/javascripts/origami.js | 30 +++++++++++---- app/controllers/crm/customers_controller.rb | 38 +++++++++---------- .../origami/customers_controller.rb | 8 ++-- app/controllers/origami/home_controller.rb | 31 ++++++++++----- app/models/customer.rb | 4 +- app/models/dining_queue.rb | 1 - app/models/lookup.rb | 4 ++ app/models/order.rb | 10 +++-- app/views/crm/customers/index.html.erb | 20 +++++----- app/views/origami/customers/index.html.erb | 12 +++++- app/views/origami/home/index.html.erb | 16 ++++++-- ...=> 20170612031153_create_dining_queues.rb} | 4 +- spec/models/dining_queue_spec.rb | 5 +++ 13 files changed, 121 insertions(+), 62 deletions(-) rename db/migrate/{20170608105644_create_crm_dining_queues.rb => 20170612031153_create_dining_queues.rb} (59%) create mode 100644 spec/models/dining_queue_spec.rb diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index fe209451..34a25dc1 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -27,11 +27,8 @@ $(document).ready(function(){ control_button(order_status); //for customer button - if(unique_id.charAt(0) == 'S'){ $("#customer").removeAttr('disabled'); - }else{ - $("#customer").attr('disabled','disabled'); - } + var customer_id=$(this).find(".customer-id").text(); show_customer_details(customer_id); @@ -161,13 +158,20 @@ $(document).ready(function(){ }); $('#customer').click(function() { - var sale_id=$(".selected-item").find(".orders-id").text(); + var sale = $(".selected-item").find(".orders-id").text(); + if (sale.substring(0, 3)=="SAL") { + var sale_id = sale + }else{ + var sale_id = $(".selected-item").find(".order-cid").text(); + } + alert(sale_id); window.location.href = '/origami/'+ sale_id + "/add_customer" return false; }); function show_customer_details(customer_id){ + $('.customer_detail').removeClass('hide'); //Start Ajax $.ajax({ @@ -176,8 +180,20 @@ $(document).ready(function(){ data: {}, dataType: "json", success: function(data) { - $("#customer_name").text(data.name); - $("#customer_name").text(data.name); + $("#customer_name").text(data["customer"].name); + $.each(data["response_data"]["data"], function (i) { + if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){ + var balance = data["response_data"]["data"][i]["balance"]; + console.log(balance); + if (balance) { + $("#customer_amount").text(balance); + }else{ + $("#customer_amount").text('00'); + } + + + } + }); } }); //End Ajax diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 9f73edcf..30c09f06 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -14,9 +14,9 @@ class Crm::CustomersController < BaseCrmController end #@crm_customers = Customer.all @crm_customer = Customer.new - @crm_customer.valid? - - + if @crm_customer.valid? + @crm_customer.errors.messages + end # @membership = Customer.get_member_group # if @membership["status"] == true # @member_group = @membership["data"] @@ -54,17 +54,17 @@ class Crm::CustomersController < BaseCrmController # POST /crm/customers # POST /crm/customers.json - def create + def create @crm_customers = Customer.new(customer_params) - + respond_to do |format| if @crm_customers.save name = customer_params[:name] phone = customer_params[:contact_no] email = customer_params[:email] date_of_birth = customer_params[:date_of_birth] - membership_id = params[:membership_id] + member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("create_membership_customer") @@ -73,7 +73,7 @@ class Crm::CustomersController < BaseCrmController response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, - membership_id: membership_id}.to_json, + member_group_id: member_group_id}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' @@ -85,37 +85,34 @@ class Crm::CustomersController < BaseCrmController customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - if params[:sale_id].nil? - - format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } - + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } + else + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'} + end # format.json { render :index, status: :created, location: @crm_customers } else @crm_customers.destroy - if params[:sale_id].nil? + if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} else format.html { redirect_to crm_customers_path, notice: response["message"] } end end - # format.json { render :index, status: :created, location: @crm_customers } - else - - if params[:sale_id].nil? - + + if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} else - format.html { redirect_to crm_customers_path} format.json { render json: @crm_customers.errors, status: :unprocessable_entity } end end - end + end end @@ -131,6 +128,7 @@ end email = customer_params[:email] date_of_birth = customer_params[:date_of_birth] id = customer_params[:membership_id] + member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("update_membership_customer") @@ -139,7 +137,7 @@ end response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, - id: id}.to_json, + id: id,member_group_id:member_group_id}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 7917b03f..74148296 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -23,10 +23,10 @@ class Origami::CustomersController < BaseOrigamiController @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) end @crm_customer = Customer.new - @membership = Customer.get_member_group - if @membership["status"] == true - @member_group = @membership["data"] - end + # @membership = Customer.get_member_group + # if @membership["status"] == true + # @member_group = @membership["data"] + # end respond_to do |format| # format.html { render :template => "crm/customers/index" } format.html { render action: "index"} diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 1b16ab54..e5e2128f 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -29,15 +29,21 @@ class Origami::HomeController < BaseOrigamiController def update_sale_by_customer - sale = Sale.find(params[:sale_id]) - status = sale.update_attributes(customer_id: params[:customer_id]) - - if status == true + id = params[:sale_id][0,3] + if(id == "SAL") + sale = Sale.find(params[:sale_id]) + else + sale = Order.find(params[:sale_id]) + end + + status = sale.update_attributes(customer_id: params[:customer_id]) + + if status == true render json: JSON.generate({:status => true}) - else + else render json: JSON.generate({:status => false, :error_message => "Record not found"}) - end + end end def get_customer @@ -50,15 +56,20 @@ class Origami::HomeController < BaseOrigamiController app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - response = HTTParty.post(url, :body => { membership_id: @customer.membership_id}.to_json, + response = HTTParty.get(url, :body => { membership_id: @customer.membership_id}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' } ) - - - render :json => response.to_json + respond_to do |format| + format.js do + render :json => { + :response_data => response.as_json, + :customer => @customer} + end + end end + end diff --git a/app/models/customer.rb b/app/models/customer.rb index 4f013678..b5e101cb 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -14,9 +14,9 @@ class Customer < ApplicationRecord def self.get_member_group - membership = MembershipSetting.find_by_membership_type("paypar_url") + membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("get_all_member_group") - app_token = membership.auth_token.to_s + app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.get(url, diff --git a/app/models/dining_queue.rb b/app/models/dining_queue.rb index dfcc5b43..ea6a1381 100644 --- a/app/models/dining_queue.rb +++ b/app/models/dining_queue.rb @@ -1,3 +1,2 @@ class DiningQueue < ApplicationRecord - end diff --git a/app/models/lookup.rb b/app/models/lookup.rb index e1b141df..5434cedd 100644 --- a/app/models/lookup.rb +++ b/app/models/lookup.rb @@ -17,6 +17,10 @@ class Lookup < ApplicationRecord "Gateway Communication Type" => "gateway_communication_type"} end + # def self.get_by_type( lookup_type) + # Lookup.select("value, name").where("lookup_type = ?", lookup_type ).order("name asc").map { |r| [r.name, r.value] } + # end + def self.collection_of(type) Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] } diff --git a/app/models/order.rb b/app/models/order.rb index f4a4eff9..0b57f9dc 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -222,7 +222,8 @@ class Order < ApplicationRecord #Origami: Cashier : to view booking order Table def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.customer_id as customer_id, + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") @@ -235,7 +236,9 @@ class Order < ApplicationRecord #Origami: Cashier : to view order type Room def self.get_booking_order_rooms - booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status,bookings.booking_id,orders.customer_id as customer_id, + booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, + bookings.booking_id,orders.customer_id as customer_id, sales.sale_id as sale_id,dining_facilities.name as room_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") @@ -264,7 +267,8 @@ class Order < ApplicationRecord from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, - orders.customer_id as customer_id,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id + ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.order_id = orders.order_id left join bookings on bookings.booking_id = booking_orders.order_id left join dining_facilities on dining_facilities.id = bookings.dining_facility_id diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index c3fb4064..9f62b55b 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -71,7 +71,6 @@ <%= simple_form_for @crm_customer,:url => crm_customers_path, :method => :post do |f| %> - <%= f.error_notification %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %> @@ -94,17 +93,20 @@
- <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%> + <%= f.text_field :date_of_birth,:class => "form-control datepicker date_of_birth "%>
+
+ +
+ -
<%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %> <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %> diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 974dceb8..070d6d26 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -96,6 +96,16 @@ <%= f.text_field :date_of_birth,:class=>"form-control date_of_birth datepicker"%>
+ +
+ +
@@ -194,7 +204,7 @@ action: function(){ $.ajax({ type: "POST", - url: "update_sale/" , + url: "update_sale" , data: {customer_id:customer_id,sale_id:sale_id}, dataType: "json", success: function(data) { diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 459e8061..154f489d 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -25,19 +25,23 @@ @booking_orders.each do |bko| # Assigned Id for new Order? Sale? unique_id="" + customer_id="" # For CSS- Class for Order? Sale? sale_status="" if bko.order_status == 'new' unique_id=bko.booking_id + customer_id=bko.order_customer_id else unique_id=bko.sale_id + customer_id=bko.sale_customer_id sale_status="sold" end %>
- + +

<%= bko.table_name %>

@@ -72,15 +76,18 @@ sale_status="" if rmo.order_status == 'new' unique_id=rmo.booking_id + customer_id=rmo.order_customer_id else unique_id=rmo.sale_id + customer_id=rmo.sale_customer_id sale_status="sold" end %>

- + +

<%= rmo.room_name %>

Receipt No : @@ -114,15 +121,18 @@ sale_status="" if odr.order_status == 'new' unique_id=odr.booking_id + customer_id = odr.order_customer_id else unique_id=odr.sale_id + customer_id = odr.sale_customer_id sale_status="sold" end %>

- + +

<%= odr.table_name %>

Receipt No : diff --git a/db/migrate/20170608105644_create_crm_dining_queues.rb b/db/migrate/20170612031153_create_dining_queues.rb similarity index 59% rename from db/migrate/20170608105644_create_crm_dining_queues.rb rename to db/migrate/20170612031153_create_dining_queues.rb index 3929719e..3cf26418 100644 --- a/db/migrate/20170608105644_create_crm_dining_queues.rb +++ b/db/migrate/20170612031153_create_dining_queues.rb @@ -1,6 +1,6 @@ -class CreateCrmDiningQueues < ActiveRecord::Migration[5.1] +class CreateDiningQueues < ActiveRecord::Migration[5.1] def change - create_table :crm_dining_queues do |t| + create_table :dining_queues do |t| t.string :name t.string :contact_no t.string :queue_no diff --git a/spec/models/dining_queue_spec.rb b/spec/models/dining_queue_spec.rb new file mode 100644 index 00000000..185068c3 --- /dev/null +++ b/spec/models/dining_queue_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe DiningQueue, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From 59520bf7ecf419f491d1d6a5c168c6cf14b14554 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 14:35:59 +0630 Subject: [PATCH 48/71] table status update --- app/models/sale_payment.rb | 13 ++++++++++--- app/views/origami/payments/show.html.erb | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 5dff91b9..5804f602 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -215,14 +215,21 @@ class SalePayment < ApplicationRecord self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! - table_update_status() + table_update_status(sObj) rebat() end end - def table_update_status - + def table_update_status(sale_obj) + booking = Booking.find_by_sale_id(sale_obj.id) + if booking + table = DiningFacility.find(booking.dining_facility_id) + if table + table.status = "available" + table.save + end + end end def rebat diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 7eb890f4..4cff678d 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -233,7 +233,7 @@ $( document ).ready(function() { data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ alert("Thank you") - // window.location.href = '/origami'; + window.location.href = '/origami'; } }); } From 622aa4f121cdc73a4510e600d75e4b583acf4724 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 15:39:38 +0630 Subject: [PATCH 49/71] update origami js and index --- app/assets/javascripts/origami.js | 1 - app/views/origami/home/index.html.erb | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 6fcc9759..45c6d909 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -181,7 +181,6 @@ $(document).ready(function(){ }else{ var sale_id = $(".selected-item").find(".order-cid").text(); } - alert(sale_id); window.location.href = '/origami/'+ sale_id + "/add_customer" return false; diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 6892c04c..4bcc5863 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -28,10 +28,12 @@ # ToDo no need check new # Assigned Id for new Order? Sale? unique_id="" + customer_id="" # For CSS- Class for Order? Sale? sale_status="" if cpo.order_status == 'new' unique_id=cpo.booking_id + customer_id=cpo.order_customer_id # check selected item and assign if @selected_item != nil if cpo.order_id == @selected_item.order_id @@ -40,6 +42,7 @@ end else unique_id=cpo.sale_id + customer_id=cpo.sale_customer_id sale_status="paid" # check selected item and assign if @selected_item != nil @@ -52,7 +55,8 @@

- + +

<%= cpo.table_name %>

Receipt No : From 4af0c4fc13c1a13842e0a0d2833448d8087a4d9e Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 16:20:16 +0630 Subject: [PATCH 50/71] add seed --- db/seeds.rb | 14 +++++++------- dump.rdb | Bin 20467 -> 20762 bytes 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index ae2d617d..52a33c08 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -145,17 +145,17 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"},merchant_account_id:"vWSsseoZCzxd6xcNf_uS") member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}}, - {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}}, - {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer"}, - {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer"}, - {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group"}, - {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}}, + {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, + {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, + {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, + {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, + {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"} ]) -payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"},merchant_account_id:"vWSsseoZCzxd6xcNf_uS") # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", diff --git a/dump.rdb b/dump.rdb index 9a81a61e209e6152e39a6f20ab56fb2fd13d5afc..62a327a0758d8fec91f4931d799425e149591f2c 100644 GIT binary patch delta 741 zcmW;FOG{Ky007`Sb90=$8l{V@teJ5f8>KUx_rpb`5<#y;5xpk#oO{l35eAjDlWEy9 z8CSLFK~h;W1yLllur_V{2QBh4XhF+@z=dRef8hJ|Fm?Y)>K@z`oH~4QBYW$nvtZgy ze||JPH~OG^eEGymZY2tWzK$Sh4}#HW^||4m`pfWi{mqeq62gK}h!xNdAwZFpz&PW9 zmrxoiNf;|m>X(j|>K{{4J++tAwDOE|t36YQGNBx2oM9~T^L_CRr)Qj<&@=rbh$?{@ z793V6CsNY<)!^FXyVWR{Q54N?E~W~N;Cb@2k#k1H-eCwRa}rRC7%-M`V2S3&NgfKx zRiStCPr@1jt|g$cn^R#pb%=TGVh9Ci#uF%Iem;pBY0N5xl@M`+k{!)E`8Led?B?s_ zMKeb|V_sMdta2VuMF}vFQy>);%0L_%E^T2?GSUoC0-9Ndy?_iMRkRVNLTZR=Rv4oH zMa}Izf zpcHZ-j)}L{X>0u0mt>?7kQS(JiyhObI8prG>7j8#3(lz}sDG^0UhPDJ3kEAh62?`l z#lVG(;=oB{%Tqh00SX@S8W_xDW*Co4KMTEE&3a`iYbiyBSSHKA zQ{I%11*o(yUEfIW@AgWdk$#DI>Yo YELO)Cljv<6-aVN;cktVpw*1%dFACn=!Tq1?3P6 z8DimsW#yyImGWcOEtl8i#8_>7vIw60Bv2%fQF!d{_lkSb?Z$A+?Ot33X^|^X8i!2w z+XVV|$la|EN8NlL0mdh9vU*zOAz}a_B^AyAmE0B7T8OkLL<%9gM)1iEdRxD1RS{9s zs$EQ?a*&X*!P_qL5glqRgMj{ieX2SGs8O+@FhXftpRSIwyoHR9Pu|t9tK0=dFRZ4~ zK%f$gr Date: Mon, 12 Jun 2017 16:24:56 +0630 Subject: [PATCH 51/71] Add Seed --- db/seeds.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index 52a33c08..4e31b429 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -145,17 +145,17 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"},merchant_account_id:"vWSsseoZCzxd6xcNf_uS") +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) -member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}}, +member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, - {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"} + {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"} ]) -payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"},merchant_account_id:"vWSsseoZCzxd6xcNf_uS") +payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", From 870dc22249e32608037fa94afac8e526ccf81ec7 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 16:26:50 +0630 Subject: [PATCH 52/71] add merchant uid --- app/models/sale_payment.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 5804f602..8606b44a 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -82,9 +82,10 @@ class SalePayment < ApplicationRecord membership_actions_data = MembershipAction.find_by_membership_type("redeem"); if !membership_actions_data.nil? url = paypar_url.to_s + membership_actions_data.gateway_url.to_s - campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"] + merchant_uid = membership_actions_data.merchant_account_id + campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"] response = HTTParty.post(url, - :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json, + :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' From 6d34f925060119f84141d30403e8ecbaddc751ca Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 16:33:18 +0630 Subject: [PATCH 53/71] update crm api --- app/controllers/crm/customers_controller.rb | 8 ++++---- app/controllers/origami/customers_controller.rb | 9 +++++++-- app/controllers/origami/home_controller.rb | 4 ++-- config/initializers/kaminari_config.rb | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index c9c24240..b3656673 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -68,12 +68,12 @@ class Crm::CustomersController < BaseCrmController membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("create_membership_customer") - app_token = membership.auth_token.to_s + merchant_uid = memberaction.merchant_account_id.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, - member_group_id: member_group_id}.to_json, + member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' @@ -129,12 +129,12 @@ end membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("update_membership_customer") - app_token = membership.auth_token.to_s + merchant_uid = memberaction.merchant_account_id.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, - id: id,member_group_id:member_group_id}.to_json, + id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 74148296..a1a067fe 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -18,15 +18,20 @@ class Origami::CustomersController < BaseOrigamiController filter = params[:filter] if filter.nil? - @crm_customers = Customer.order("name").page(params[:page]) + @crm_customers = Customer.order("name").page params[:page] else - @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page(params[:page]) + @crm_customers = Customer.where("name LIKE ?", "%#{filter}%").order("name").page params[:page] end + # @crm_customers = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(2) @crm_customer = Customer.new # @membership = Customer.get_member_group # if @membership["status"] == true # @member_group = @membership["data"] # end + puts "Errrrrrrrrrrrrrrrrr" + puts @crm_customer.new_record? + + respond_to do |format| # format.html { render :template => "crm/customers/index" } format.html { render action: "index"} diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 3db086b9..5742c366 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -72,10 +72,10 @@ class Origami::HomeController < BaseOrigamiController membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("get_all_member_account") - app_token = membership.auth_token.to_s + merchant_uid = memberaction.merchant_account_id.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - response = HTTParty.get(url, :body => { membership_id: @customer.membership_id}.to_json, + response = HTTParty.get(url, :body => { membership_id: @customer.membership_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb index b1d87b01..bcf4e43b 100644 --- a/config/initializers/kaminari_config.rb +++ b/config/initializers/kaminari_config.rb @@ -1,5 +1,5 @@ Kaminari.configure do |config| - # config.default_per_page = 25 + config.default_per_page = 2 # config.max_per_page = nil # config.window = 4 # config.outer_window = 0 From e6647dd494e155712ed8dead9a410464209ca80d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 16:48:20 +0630 Subject: [PATCH 54/71] Seed Edit --- app/controllers/crm/customers_controller.rb | 2 +- db/seeds.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index b3656673..01acd441 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -68,7 +68,7 @@ class Crm::CustomersController < BaseCrmController membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("create_membership_customer") - merchant_uid = memberaction.merchant_account_id.to_s + merchant_uid = memberaction.merchant_account_id.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, diff --git a/db/seeds.rb b/db/seeds.rb index 4e31b429..6849f008 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -145,7 +145,7 @@ order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSu request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"}) crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, @@ -155,7 +155,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}, {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"} ]) -payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) +payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) # shop = Shop.create( # {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", From d1ae734f50a131643975d4477558f6c6f22e18e1 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 17:30:49 +0630 Subject: [PATCH 55/71] update --- app/assets/javascripts/origami.js | 20 +-- app/models/order.rb | 4 +- app/models/sale_item.rb | 16 +-- app/views/origami/home/index.html.erb | 123 +++++++++--------- app/views/origami/payments/show.html.erb | 4 +- .../origami/redeem_payments/index.html.erb | 36 ++--- db/seeds.rb | 8 +- 7 files changed, 107 insertions(+), 104 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 6fcc9759..c15b6991 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -28,7 +28,7 @@ $(document).ready(function(){ $("#order-Tax").text(''); $("#order-grand-total").text(''); - var zone_name=$(this).find(".orders-table").text(); + var zone_name=$(this).find(".orders-table").text(); var receipt_no=$(this).find(".orders-receipt-no").text(); var unique_id = $(this).find(".orders-id").text(); var order_status=$(this).find(".orders-order-status").text().trim(); @@ -38,11 +38,11 @@ $(document).ready(function(){ //for customer button $("#customer").removeAttr('disabled'); - + var customer_id=$(this).find(".customer-id").text(); show_customer_details(customer_id); - + var cashier=""; var receipt_date=""; @@ -60,7 +60,7 @@ $(document).ready(function(){ type: "POST", url: "/origami/" + unique_id, data: { 'booking_id' : unique_id }, - success:function(result){ + success:function(result){ for (i = 0; i < result.length; i++) { var data = JSON.stringify(result[i]); var parse_data = JSON.parse(data); @@ -77,7 +77,7 @@ $(document).ready(function(){ //Receipt Charges sub_total += (parse_data.qty*parse_data.price); - + discount_amount = parse_data.discount_amount == null? '0.0' : parse_data.discount_amount; tax_amount = parse_data.tax_amount; grand_total_amount = parse_data.grand_total_amount; @@ -187,12 +187,12 @@ $(document).ready(function(){ return false; }); - function show_customer_details(customer_id){ + function show_customer_details(customer_id){ - $('.customer_detail').removeClass('hide'); + $('.customer_detail').removeClass('hide'); //Start Ajax - $.ajax({ - type: "GET", + $.ajax({ + type: "GET", url: "origami/"+customer_id+"/get_customer/", data: {}, dataType: "json", @@ -213,7 +213,7 @@ $(document).ready(function(){ }); } }); - //End Ajax + //End Ajax } /* For Receipt - Calculate discount or tax */ diff --git a/app/models/order.rb b/app/models/order.rb index ff16cb94..04274399 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -231,7 +231,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") end @@ -261,7 +261,7 @@ class Order < ApplicationRecord .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id") end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 25b37178..404787f7 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -1,6 +1,6 @@ class SaleItem < ApplicationRecord self.primary_key = "sale_item_id" - + #primary key - need to be unique generated for multiple shops before_create :generate_custom_id @@ -12,17 +12,17 @@ class SaleItem < ApplicationRecord def self.get_order_items_details(sale_id) - order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,DATE_FORMAT(sales.receipt_date,'%Y-%m-%d %h:%m') as receipt_date, + order_details = SaleItem.select("sales.total_tax as tax_amount, sales.grand_total as grand_total_amount , sales.total_discount as discount_amount,sales.receipt_date as receipt_date, sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price") .joins("left join sales on sales.sale_id = sale_items.sale_id") .where("sale_items.sale_id=?",sale_id) # sale_orders = SaleOrder.where("sale_id=?",sale_id) # if sale_orders - # sale_orders.each do |sale_order| + # sale_orders.each do |sale_order| # order_details = SaleItem.select("sales.total_discount as discount_amount,DATE_FORMAT(sales.receipt_date,'%Y-%m-%d %h:%m') as receipt_date,sales.cashier_name,sales.receipt_no,sale_items.product_name as item_name,sale_items.qty,sale_items.price,sale_items.unit_price as total_price") # .joins("left join sales on sales.id = sale_items.sale_id") - # .where("sale_items.sale_id=?",sale_order.sale_id) + # .where("sale_items.sale_id=?",sale_order.sale_id) # return order_details # end # else @@ -36,7 +36,7 @@ class SaleItem < ApplicationRecord sale_items.each do |si| food_price = self.get_food_price(si.sale_item_id) - beverage_price = self.get_beverage_price(si.sale_item_id) + beverage_price = self.get_beverage_price(si.sale_item_id) food_prices = food_prices + food_price beverage_prices = beverage_prices + beverage_price end @@ -47,16 +47,16 @@ class SaleItem < ApplicationRecord food=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id.to_s) - food_price = food[0].price rescue 0 + food_price = food[0].price rescue 0 end def self.get_beverage_price(sale_item_id) beverage=SaleItem.select("sale_items.price") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") .where("sale_items.sale_item_id=? and menu_items.account_id=2", sale_item_id.to_s) - beverage_price = beverage[0].price rescue 0 + beverage_price = beverage[0].price rescue 0 end - + private def generate_custom_id self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 6892c04c..83678543 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -23,37 +23,38 @@

- <% - @completed_orders.each do |cpo| + <% + @completed_orders.each do |cpo| # ToDo no need check new # Assigned Id for new Order? Sale? - unique_id="" + unique_id = "" + customer_id = "" # For CSS- Class for Order? Sale? sale_status="" - if cpo.order_status == 'new' + if cpo.order_status == 'new' unique_id=cpo.booking_id - # check selected item and assign - if @selected_item != nil + # check selected item and assign + if @selected_item != nil if cpo.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" end end - else + else unique_id=cpo.sale_id sale_status="paid" - # check selected item and assign + # check selected item and assign if @selected_item != nil if unique_id == @selected_item.sale_id sale_status = sale_status + " selected-item" end end - end + end %>
- - -

<%= cpo.table_name %>

+ + +

<%= cpo.table_name %>

Receipt No : @@ -64,12 +65,12 @@ Order Status : <%= cpo.order_status %> - + -

-
-
- <% +

+
+
+ <% end %>
@@ -78,39 +79,39 @@
- <% - @booking_orders.each do |bko| + <% + @booking_orders.each do |bko| # Assigned Id for new Order? Sale? unique_id="" customer_id="" # For CSS- Class for Order? Sale? sale_status="" - if bko.order_status == 'new' + if bko.order_status == 'new' unique_id=bko.booking_id customer_id=bko.order_customer_id - # check selected item and assign - if @selected_item != nil + # check selected item and assign + if @selected_item != nil if bko.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" end end - else + else unique_id=bko.sale_id customer_id=bko.sale_customer_id sale_status="sold" - # check selected item and assign + # check selected item and assign if @selected_item != nil if unique_id == @selected_item.sale_id sale_status = sale_status + " selected-item" end end - end + end %>
- - - + + +

<%= bko.table_name %>

Receipt No : @@ -144,32 +145,32 @@ # For CSS- Class for Order? Sale? sale_status="" - if rmo.order_status == 'new' + if rmo.order_status == 'new' unique_id=rmo.booking_id customer_id=rmo.order_customer_id - # check selected item and assign - if @selected_item != nil + # check selected item and assign + if @selected_item != nil if rmo.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" - end - end - else + end + end + else unique_id=rmo.sale_id customer_id=rmo.sale_customer_id sale_status="sold" - # check selected item and assign + # check selected item and assign if @selected_item != nil if unique_id == @selected_item.sale_id sale_status = sale_status + " selected-item" end end - end + end %>

- + - +

<%= rmo.room_name %>

Receipt No : @@ -194,19 +195,19 @@

-
- <% - @orders.each do |odr| +
+ <% + @orders.each do |odr| # Assigned Id for new Order? Sale? unique_id="" customer_id="" # For CSS- Class for Order? Sale? - sale_status="" + sale_status="" - if odr.order_status == 'new' + if odr.order_status == 'new' unique_id=odr.booking_id customer_id = odr.order_customer_id - if @selected_item != nil + if @selected_item != nil if odr.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" end @@ -214,9 +215,9 @@ else unique_id=odr.sale_id customer_id = odr.sale_customer_id - sale_status="sold" - # check selected item and assign - if @selected_item != nil + sale_status="sold" + # check selected item and assign + if @selected_item != nil if unique_id == @selected_item.sale_id sale_status = sale_status + " selected-item" end @@ -225,9 +226,9 @@ %>
- - - + + +

<%= odr.table_name %>

Receipt No : @@ -266,19 +267,19 @@

Receipt No: <%=@selected_item.receipt_no rescue ' '%>

-
+

Date: <%=@selected_item.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

-
+

Customer :

- -
+ +

Amount :

-
+
@@ -290,7 +291,7 @@ - <% + <% # For Sale Items sub_total = 0 if @selected_item_type == "Sale" @@ -298,16 +299,16 @@ sub_total += sale_item.qty*sale_item.unit_price %> - + - <% + <% end end %> - <% + <% # For Order Items sub_total = 0 if @selected_item_type == "Order" @@ -315,11 +316,11 @@ sub_total += order_item.qty*order_item.unit_price %> - + - <% + <% end end %> diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 4cff678d..072446a1 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -6,8 +6,8 @@
<%= sale_item.product_name %><%= sale_item.product_name %> <%= sale_item.qty %> <%= sale_item.qty*sale_item.price %>
<%= order_item.item_name %><%= order_item.item_name %> <%= order_item.qty %> <%= order_item.qty*order_item.price %>
- - + + diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 72c09d4d..0340134c 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -1,7 +1,7 @@
-
+
@@ -22,15 +22,15 @@
- -
+ +
-
+
1
-
2
-
3
+
2
+
3
@@ -39,10 +39,10 @@
-
+
4
-
5
-
6
+
5
+
6
@@ -51,10 +51,10 @@
-
+
7
-
8
-
9
+
8
+
9
@@ -63,10 +63,10 @@
-
+
0
-
.
-
00
+
.
+
00
@@ -75,10 +75,10 @@
-
+
-
DEL
-
CLR
+
DEL
+
CLR
diff --git a/db/seeds.rb b/db/seeds.rb index ae2d617d..563710c5 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -156,10 +156,12 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"} ]) payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"}) +payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http//192.168.1.47:3006"}) + # shop = Shop.create( -# {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", -# country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", +# {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", +# country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", # activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"} # ) - From 7a3957181c13c46a5119591eb47ad514c96f792d Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 18:15:19 +0630 Subject: [PATCH 56/71] update --- app/models/order.rb | 6 +++--- app/models/sale_payment.rb | 2 +- app/views/origami/payments/show.html.erb | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 04274399..8c0fadbc 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -237,14 +237,14 @@ class Order < ApplicationRecord #Origami: Cashier : to view booking order Table def self.get_completed_order - completed_orders = Booking.select("sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + completed_orders = Booking.select("sales.receipt_no,orders.status as order_status,orders.order_id, + bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 8606b44a..386d6ca6 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -60,7 +60,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by) - + return false, "No outstanding Amount" end diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 072446a1..f9ae06b7 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -232,7 +232,12 @@ $( document ).ready(function() { url: "<%= origami_payment_cash_path %>", data: "cash="+ cash + "&sale_id=" + sale_id, success:function(result){ - alert("Thank you") + if($('#balance').text() < 0){ + alert("Changed amount " + $('#balance').text() * (-1) ) + }else{ + alert("Thank you") + } + window.location.href = '/origami'; } }); From b47c983886fce6b353408feb05d7f79adf53a3bd Mon Sep 17 00:00:00 2001 From: Moe Su Date: Mon, 12 Jun 2017 18:18:24 +0630 Subject: [PATCH 57/71] Edit Redim --- Gemfile | 2 +- Gemfile.lock | 2 -- .../origami/redeem_payments_controller.rb | 3 ++- app/models/sale_payment.rb | 6 +++--- .../origami/redeem_payments/index.html.erb | 7 ++++--- config/routes.rb | 2 +- dump.rdb | Bin 20762 -> 20860 bytes 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 02dca6af..b08df141 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +# gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 4235d035..6a7c6340 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,6 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -247,7 +246,6 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index 0821a2d8..5fd386e8 100644 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -16,7 +16,8 @@ class Origami::RedeemPaymentsController < BaseOrigamiController 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 - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) + merchant_uid= member_actions.merchant_account_id + membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @out = true, @membership_rebate_balance,@membership_id diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 8606b44a..a86a16e4 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -66,9 +66,9 @@ class SalePayment < ApplicationRecord end - def self.get_paypar_account(url,token,membership_id,campaign_type_id) + def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid) response = HTTParty.get(url, - :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id}.to_json, + :body => { app_token: token,membership_id:membership_id,campaign_type_id:campaign_type_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' @@ -85,7 +85,7 @@ class SalePayment < ApplicationRecord merchant_uid = membership_actions_data.merchant_account_id campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"] response = HTTParty.post(url, - :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid}.to_json, + :body => { generic_customer_id:membership_id,redeem_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:"",merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 72c09d4d..81437de4 100644 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -140,13 +140,14 @@ $("#redeem").click(function(){ membership_id = $("#valid_amount").attr('data-member-value'); redeem_amount = parseInt($("#used_amount").text()); if(redeem_amount<=0 ){ - alert(" Insufficient Amount!") - }else if(valid_amount< redeem_amount || redeem_amount == ""){ alert("Please type valid amount"); + + }else if(valid_amount< redeem_amount){ + alert(" Insufficient Amount!") }else{ $.ajax({ type: "POST", - url: "<%=origami_paypar_payment_process_path%>", + url: "<%=origami_payment_paypar_path%>", data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, success: function(result){ if(result.status == true){ diff --git a/config/routes.rb b/config/routes.rb index 816b53f7..76e1498c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -87,7 +87,7 @@ Rails.application.routes.draw do #--------- Payment ------------# get 'sale/:sale_id/payment' => 'payments#show' post 'payment/cash' => 'payments#create' - post 'paypar_payment_process' => 'paypar_payments#create' + post 'payment/paypar' => 'paypar_payments#create' get 'sale/:sale_id/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/payment/others_payment' => "others_payments#index" diff --git a/dump.rdb b/dump.rdb index 62a327a0758d8fec91f4931d799425e149591f2c..4d2c7d9e5136fdfd8a4a5fb5cafdaedbad0830f9 100644 GIT binary patch delta 453 zcmV~$OKTHB007|GOd2*WEm)~gRFbAisnrQHv-7M(2-Y49v7o0~eC%X)JxE2{3Z)RN z|3Dc}dXZwZ3cD9kh~P!=;?ZA_rPRAeixj`_)t>in&wGwfUfjIAdgMRZj4fJ^*T3UO zFWRpsmulUe%FZ|dKLY@K0NU@}pQ%&sSMj=A@#>AxN)yH`M1tcOF_REvxJ?koB2r2a zD0?Ay&z2iySX)`TQC%JZcV~fici&7gL2XYOVkAx?F0t(qX_I#GY;PluwqkoX+Nv!Q zrX>|jGu&iE5gJw>fQR=!kAg}`VbMSS=;iyV+wkW6yp;l$qtqRFXX?41LQbWaNsA&> ziseB%0+lh%NdGu%r(pl!?V9Tp=Euz7fUmjjLhI=`OE^!YjgZxGg6h{MLu9aENNFau z!PE$4XQuPT?67&l=QNR+6QXBri884oOs;+dQT1gWWM!h8QfjU>%_p+mswa6Ph_c^< zA&|8%P$-6HZvr+q^b&pL_5=+PC9#w6QsGD7wqX+=?a*F`epC zQWVh&6?KlzK0wgHmgpIRi0J!%d!f@_sB27sMrHjcda&;b*mm2m=QGFEv&q`a!XP=& z0Z5DiFakjJTBbEF7ehH&SMu_HE-#Pbl_kzROo-qfW+uXvxdanzSu}N$*xGY>#}%8r zlPQ~sQ43p?7)3-%wvAFdV7K-3p(i5@nTLP3p|lTff=gdMChR_GR@HaAQ`osw*+Q!#~N za?$^~(gDpptHee|c11%jM6#>aBY7S4Yfbs47S&JKl%ruB5AJ-03z}PtFallM6ou_^ W+kwpR_~S-6)`+f750|ynyZR4Kz++ng From 423776cadd49d6f9a4a7e2ef7e39ebbe1d4be130 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 18:19:30 +0630 Subject: [PATCH 58/71] print format update --- app/assets/javascripts/cable.js | 9 +- app/controllers/origami/home_controller.rb | 1 + .../origami/request_bills_controller.rb | 2 +- app/models/order.rb | 8 +- app/models/sale_item.rb | 25 +-- app/pdf/receipt_bill_pdf.rb | 142 +++++++++--------- config/routes.rb | 2 +- 7 files changed, 99 insertions(+), 90 deletions(-) diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js index 739aa5f0..ce5ac871 100644 --- a/app/assets/javascripts/cable.js +++ b/app/assets/javascripts/cable.js @@ -5,9 +5,10 @@ //= require_self //= require_tree ./channels -(function() { - this.App || (this.App = {}); +// Temp Disable +// (function() { +// this.App || (this.App = {}); - App.cable = ActionCable.createConsumer(); +// App.cable = ActionCable.createConsumer(); -}).call(this); +// }).call(this); diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 669c8a7f..ae2492d9 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -12,6 +12,7 @@ class Origami::HomeController < BaseOrigamiController @selected_item_type="Order" end end + puts params[:booking_id] @completed_orders = Order.get_completed_order() @booking_orders = Order.get_booking_order_table() diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index 4e884aaf..58ba0b11 100644 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -30,7 +30,7 @@ class Origami::RequestBillsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total) - redirect_to origami_path(sale_order.sale_id) + redirect_to origami_path(@sale_data.sale_id) end end diff --git a/app/models/order.rb b/app/models/order.rb index 4526ce35..ebb3b032 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -247,8 +247,6 @@ class Order < ApplicationRecord .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") - - end #Origami: Cashier : to view booking order Table @@ -259,7 +257,7 @@ class Order < ApplicationRecord .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") end @@ -273,7 +271,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) + .where("sales.sale_status<>'completed' and sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") end @@ -303,7 +301,7 @@ class Order < ApplicationRecord left join order_items on order_items.order_id = orders.order_id left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'complete' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + .where("sales.sale_status<>'completed' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id") end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 25b37178..e98d3f7e 100644 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -35,26 +35,27 @@ class SaleItem < ApplicationRecord beverage_prices=0 sale_items.each do |si| - food_price = self.get_food_price(si.sale_item_id) - beverage_price = self.get_beverage_price(si.sale_item_id) + food_price, beverage_price = self.get_price(si.sale_item_id) food_prices = food_prices + food_price beverage_prices = beverage_prices + beverage_price end return food_prices, beverage_prices end - def self.get_food_price(sale_item_id) - food=SaleItem.select("sale_items.price") - .joins("left join menu_items on menu_items.item_code = sale_items.product_code") - .where("sale_items.sale_item_id=? and menu_items.account_id=1", sale_item_id.to_s) - food_price = food[0].price rescue 0 - end + def self.get_price(sale_item_id) + food_price=0 + beverage_price=0 - def self.get_beverage_price(sale_item_id) - beverage=SaleItem.select("sale_items.price") + item=SaleItem.select("sale_items.price , menu_items.account_id") .joins("left join menu_items on menu_items.item_code = sale_items.product_code") - .where("sale_items.sale_item_id=? and menu_items.account_id=2", sale_item_id.to_s) - beverage_price = beverage[0].price rescue 0 + .where("sale_items.sale_item_id=?", sale_item_id.to_s) + if item[0].account_id == 1 + food_price = item[0].price + else + beverage_price = item[0].price + end + + return food_price, beverage_price end private diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index f91aebe1..dbaea572 100644 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,16 +1,16 @@ class ReceiptBillPdf < Prawn::Document - attr_accessor :receipt_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total) - self.page_width = 300 + self.page_width = 250 self.page_height = 1450 self.margin = 10 - self.price_width = 50 - self.qty_width = 30 - self.total_width = 50 - self.item_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.price_width = 40 + self.qty_width = 20 + self.total_width = 40 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)+(self.margin*4)) self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.receipt_width=100 + self.label_width=80 # @item_width = self.page_width.to_i / 2 # @qty_width = @item_width.to_i / 3 @@ -22,8 +22,8 @@ class ReceiptBillPdf < Prawn::Document # font "public/fonts/#{font_name}".to_s + ".ttf".to_s # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 12 - self.item_font_size = 10 + self.header_font_size = 11 + self.item_font_size = 9 header( printer_settings.printer_name, printer_settings.name) @@ -31,66 +31,64 @@ class ReceiptBillPdf < Prawn::Document cashier_info(sale_data, customer_name) line_items(sale_items, food_total, beverage_total) - all_total(sale_data) - - + all_total(sale_data) + footer end def header (printer_name, name) - text "#{printer_name}", :size => self.header_font_size,:align => :center - move_down 5 - text "#{name}", :size => self.header_font_size,:align => :center - # move_down self.item_height - move_down 5 + text "#{printer_name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down 5 + text "#{name}", :size => self.header_font_size,:align => :center + # move_down self.item_height + move_down 5 - stroke_horizontal_rule + stroke_horizontal_rule end def cashier_info(sale_data, customer_name) move_down 7 # move_down 2 y_position = cursor - bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do text "Receipt No:", :size => self.item_font_size,:align => :left end - bounding_box([self.receipt_width, y_position], :width =>self.receipt_width) do + bounding_box([self.label_width, y_position], :width =>self.item_width) do text "#{sale_data.receipt_no}" , :size => self.item_font_size, :align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do text "Customer:", :size => self.item_font_size,:align => :left end - bounding_box([self.receipt_width,y_position], :width =>self.receipt_width) do + bounding_box([self.label_width,y_position], :width =>self.item_width) do text "#{customer_name}" , :size => self.item_font_size,:align => :left end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>self.receipt_width, :height => self.item_height) do - text "Date:", :size => self.item_font_size,:align => :left + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Date:", :size => self.item_font_size,:align => :left end - bounding_box([self.receipt_width,y_position], :width =>self.receipt_width) do - text "#{sale_data.receipt_date.strftime('%Y %m %d %h:%m')}" , :size => self.item_font_size,:align => :left + bounding_box([self.label_width,y_position], :width => self.item_width) do + text "#{sale_data.receipt_date.strftime('%Y-%m-%d %I:%M %p')}" , :size => self.item_font_size,:align => :left end - # stroke_horizontal_rule + + move_down 5 + stroke_horizontal_rule move_down 5 end def line_items(sale_items, food_total, beverage_total) y_position = cursor - stroke_horizontal_rule - move_down 5 - pad_top(15) { # @item_width.to_i + @half_qty.to_i - text_box "Items", :at =>[0,y_position], :width => self.item_width - 20, :height =>self.item_height, :size => self.item_font_size - text_box "Price", :at =>[self.item_width-20,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right - text_box "Qty", :at =>[self.item_width+self.price_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right - text_box "Total", :at =>[self.item_width+self.price_width+self.qty_width,y_position], :width => self.total_width, :height =>self.item_height, :size => self.item_font_size, :align => :right + text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "Price", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Total", :at =>[(self.item_width+self.price_width+2),y_position], :width => self.total_width+2, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix } @@ -99,88 +97,88 @@ class ReceiptBillPdf < Prawn::Document add_line_item_row(sale_items, food_total, beverage_total) - end def add_line_item_row(sale_items, food_total, beverage_total) - item_name_width = self.item_width-20 + item_name_width = (self.item_width+self.price_width) y_position = cursor move_down 5 sub_total = 0.0 - sale_items.each do |item| + sale_items.each do |item| + sub_total += (item.qty*item.unit_price) + qty = item.qty + total_price = item.qty*item.unit_price + price = item.unit_price + product_name = item.product_name + - sub_total += item.qty*item.unit_price - qty = item.qty - total_price = item.qty*item.unit_price - price = item.unit_price - product_name = item.product_name - + y_position = cursor - y_position = cursor + pad_top(15) { + # @item_width.to_i + @half_qty.to_i + text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :overflow => :shrink_to_fix, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{price}", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{qty.to_i}", :at =>[item_name_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{total_price}", :at =>[(item_name_width+2),y_position], :width =>self.total_width+2, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - pad_top(15) { - # @item_width.to_i + @half_qty.to_i - text_box "#{product_name}", :at =>[0,y_position], :width => item_name_width, :height =>self.item_height, :overflow => :shrink_to_fix, :size => self.item_font_size - text_box "#{price}", :at =>[item_name_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right - text_box "#{qty.to_i}", :at =>[item_name_width+self.price_width,y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :right - text_box "#{total_price}", :at =>[item_name_width+self.price_width+self.qty_width,y_position], :width =>self.total_width, :height =>self.item_height, :size => self.item_font_size, :align => :right - - } - move_down 3 - end + } + move_down 3 + end stroke_horizontal_rule move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>item_name_width, :height => self.item_height) do text "Sub Total", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do - text "#{sub_total}" , :size => self.item_font_size,:align => :right + bounding_box([item_name_width,y_position], :width =>self.total_width) do + text "#{ sub_total }" , :size => self.item_font_size,:align => :right end # Food and Beverage - food_beverage_total = food_total.to_s + '/' + beverage_total.to_s + food_beverage_total = food_total.to_s + "/" + beverage_total.to_s + move_down 5 + y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width), :height => self.item_height) do text "Food/Beverage Total", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do + bounding_box([item_name_width,y_position], :width =>self.total_width) do text "#{ food_beverage_total }" , :size => self.item_font_size,:align => :right end end def all_total(sale_data) - item_name_width = self.item_width-20 + item_name_width = self.item_width move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do text "Discount", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do + bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do text "( " +"#{sale_data.total_discount}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor - bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do text "Total Tax", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do + bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right end move_down 5 y_position = cursor move_down 5 - bounding_box([0,y_position], :width =>(item_name_width+self.price_width+self.qty_width), :height => self.item_height) do + bounding_box([0,y_position], :width =>(item_name_width+self.price_width), :height => self.item_height) do text "Grand Total", :size => self.item_font_size,:align => :left end - bounding_box([(item_name_width+self.price_width+self.qty_width),y_position], :width =>self.total_width) do + bounding_box([(item_name_width+self.price_width),y_position], :width =>self.total_width) do text "#{sale_data.grand_total}" , :size => self.item_font_size,:align => :right end move_down 5 @@ -188,4 +186,14 @@ class ReceiptBillPdf < Prawn::Document end + def footer + move_down 5 + stroke_horizontal_rule + move_down 5 + + text "*** Thank You ***", :left_margin => -10, :size => self.header_font_size,:align => :center + + move_down 5 + end + end diff --git a/config/routes.rb b/config/routes.rb index ddb6e3ff..689fe60d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ Rails.application.routes.draw do mount Sidekiq::Web => '/kiq' # Action Cable Creation - mount ActionCable.server => "/cable" + # mount ActionCable.server => "/cable" #--------- SmartSales Installation ------------# get 'install' => 'install#index' From b14f4d67a5a5def04a397164332db3dd82cc2add Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 18:23:12 +0630 Subject: [PATCH 59/71] origamijs --- app/assets/javascripts/origami.js | 14 ++++++++++---- app/controllers/crm/customers_controller.rb | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 45c6d909..b3872b84 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -188,11 +188,17 @@ $(document).ready(function(){ function show_customer_details(customer_id){ + if(window.location.pathname.substring(0, 12) == "/origami/SAL"){ + var url = customer_id+"/get_customer/" + }else{ + var url = "origami/"+customer_id+"/get_customer/" + } + $('.customer_detail').removeClass('hide'); //Start Ajax $.ajax({ type: "GET", - url: "origami/"+customer_id+"/get_customer/", + url: url, data: {}, dataType: "json", success: function(data) { @@ -201,10 +207,10 @@ $(document).ready(function(){ if(data["response_data"]["data"][i]["accountable_type"] == "RebateAccount"){ var balance = data["response_data"]["data"][i]["balance"]; console.log(balance); - if (balance) { - $("#customer_amount").text(balance); + if (balance == "0.0") { + $("#customer_amount").text('0.0'); }else{ - $("#customer_amount").text('00'); + $("#customer_amount").text(balance); } diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 01acd441..c33db2e1 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -124,14 +124,14 @@ end phone = customer_params[:contact_no] email = customer_params[:email] date_of_birth = customer_params[:date_of_birth] - id = customer_params[:membership_id] + id = @crm_customer.membership_id member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("update_membership_customer") merchant_uid = memberaction.merchant_account_id.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - + response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json, From a247c142b8bfd650ba49a424e0288181b90747a0 Mon Sep 17 00:00:00 2001 From: Cherry Date: Mon, 12 Jun 2017 18:26:00 +0630 Subject: [PATCH 60/71] ReceiptList Report Rough --- Gemfile | 6 +- Gemfile.lock | 2 - app/assets/javascripts/application.js | 8 +- app/assets/stylesheets/application.scss | 2 +- .../reports/receipt_no_controller.rb | 80 +++++- app/models/sale.rb | 4 + app/views/layouts/_header.html.erb | 2 +- .../_shift_sale_report_filter.html.erb | 246 ++++++++++++++++++ app/views/reports/receipt_no/index.html.erb | 98 ++++++- app/views/reports/receipt_no/index.xls.erb | 135 ++++++++++ 10 files changed, 572 insertions(+), 11 deletions(-) create mode 100644 app/views/reports/receipt_no/_shift_sale_report_filter.html.erb create mode 100644 app/views/reports/receipt_no/index.xls.erb diff --git a/Gemfile b/Gemfile index 02dca6af..7295ffab 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +# gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' @@ -93,4 +93,8 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'httparty', '~> 0.15.5' +# gem 'momentjs-rails', '>= 2.9.0' +# gem 'bootstrap-datepicker-rails' +# gem 'momentjs-rails', '>= 2.9.0' +# gem 'bootstrap3-datetimepicker-rails', '~> 4.17.47' gem 'bootstrap-datepicker-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 4235d035..6a7c6340 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,6 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -247,7 +246,6 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) - pg prawn prawn-table puma (~> 3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8ff96589..59e4a386 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,5 +17,11 @@ //= require turbolinks //= require cable //= require settings/processing_items -//= require bootstrap-datepicker +//= require bootstrap-datepicker/core +//= require bootstrap-datepicker/locales/bootstrap-datepicker.es + +$(document).on("focus", "[data-behaviour~='datepicker']", function(e){ + $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); + $('.dropdown-toggle').dropdown(); +}); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index d8101494..468ac33d 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,7 +2,7 @@ @import "bootstrap"; @import "font-awesome"; @import "theme"; -@import "bootstrap-datepicker3"; +@import 'bootstrap-datepicker'; /* Show it is fixed to the top */ // body { diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 05065fee..930659b9 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -1,9 +1,85 @@ -class Reports::ReceiptNoController < BaseReportController +class Reports::ReceiptNoController < ApplicationController + PERIOD = { + "today" => 0, + "yesterday" => 1, + "this_week" => 2, + "last_week" => 3, + "last_7" => 4, + "this_month" => 5, + "last_month" => 6, + "last_30" => 7, + "this_year" => 8, + "last_year" => 9 + } + def index - @hi = "hi" + from, to = get_date_range_from_params + puts "from..." + puts from + puts "to..." + puts to + @sale_data = Sale.get_receipt_no_list(from,to) + @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) end def show + + end + private + def get_date_range_from_params + period_type = params[:period_type] + period = params[:period] + from = params[:from] + to = params[:to] + day_ref = Time.now + if period_type.to_i == 1 + if params[:from] && params[:to] + if params[:from] != "" && params[:to] !="" + from = DateTime.strptime(params[:from], "%m/%d/%Y") + to = DateTime.strptime(params[:to], "%m/%d/%Y") + else + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + end + end + else + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + return from, to end end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 47d271f1..52625917 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -263,4 +263,8 @@ class Sale < ApplicationRecord def generate_custom_id self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") end + + def self.get_receipt_no_list(from,to) + sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to) + end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bdd146b7..641678f9 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -36,7 +36,7 @@
  • <%= link_to "Daily Sale Report", origami_root_path, :tabindex =>"-1" %>
  • <%= link_to "Sales Item Report", origami_root_path, :tabindex =>"-1" %>
    • -
  • <%= link_to "Receipt Report", origami_root_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Receipt Report", reports_receipt_no_index_path, :tabindex =>"-1" %>
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb new file mode 100644 index 00000000..9c87d843 --- /dev/null +++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb @@ -0,0 +1,246 @@ +<%= form_tag report_path, :method => :get, :id=>"frm_report" do %> +
+
+ <% if defined? product_account %> + <%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account])%> + <% end %> + <% if defined? shift_product_account %> + <%= select_tag "account", options_from_collection_for_select(@accounts,"id","title", :selected => params[:account]), :prompt => 'All Group'%> + <% end %> +
+ +
+ <% if period_type != false %> + + + <% end %> +
+ +
+
+ Export to Excel + + +
+
+
+
+ +
+ +
+
+ <% if defined? show_sale_type %> + + <% end %> + + <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]) %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]) %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]) %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List" %> + <% end %> + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]) %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products" %> + <% end %> + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]) %> + <% end %> +
+ +
+ + +
+ To     + +
+
+ + + <% if defined? show_monthly %> +
+ +
+ + + +
+
+ <% end %> + +
+ +
+
+ +<% end %> + + \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 0bae50e7..fac08039 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,3 +1,95 @@ -
- <%= @hi %> -
\ No newline at end of file +
+
    +
  • Home
    • +
  • Receipt List Report
    • + + <%= render :partial=>'shift_sale_report_filter',:locals=>{ :period_type => true, + :shift_name => true, :report_path => reports_receipt_no_index_path} %> + +
+
+
+
Receipt No : <%=@sale_data.receipt_no rescue ' '%>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>Receipt No : <%=@sale_data.receipt_no rescue ' '%>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>
Table No <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %>
+ + + + + + + + + + + + + + + <% total_sales = 0 %> + <% net_sales = 0 %> + <% @sale_data.each do |sale| %> + <% total_sales = sale.total_amount.to_f - sale.total_discount.to_f%> + <% net_sales = total_sales.to_f + sale.total_tax.to_f%> + + + + + + + + + + + <% end %> + +
DateReceipt NoCashier NameGross SalesDiscountTotal SalesCTNett Sales
<%= sale.receipt_date.strftime("#{sale.receipt_date.day.ordinalize} %b") rescue '-' %><%=sale.receipt_no.to_s rescue ''%><%=sale.cashier_id rescue ''%><%= number_with_delimiter(sprintf("%.2f",sale.total_amount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_discount.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_sales.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale.total_tax.to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",net_sales.to_f), :delimiter => ',') %>
+
+<%= paginate @sale_data %> + \ No newline at end of file diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb new file mode 100644 index 00000000..2191d814 --- /dev/null +++ b/app/views/reports/receipt_no/index.xls.erb @@ -0,0 +1,135 @@ +
+
+ +<% unless @sale_data.empty? %> +

<%=current_active_location.name%>

+

Sales Summary Report (BreadTalk)

+<% if params[:from]%> +

From Date : <%= params[:from] %> , To Date : <%= params[:to] %>

+<% end %> + + + + + + + + + + + + + + + + + + + + + <% void = 0 %> + <% card = 0 %> + <% credit_payment = 0 %> + <% cash = 0 %> + <% credit = 0 %> + <% foc = 0 %> + <% discount = 0 %> + <% total = 0 %> + <% count = 1 %> + <% discount_rev = 0 %> + <% total_rev = 0 %> + <% grand_rev = 0 %> + <% total_other_charges=0 %> + <% total_tax=0 %> + <% cash_received = 0 %> + <% total_cash_received = 0 %> + <% today_credit_payment_amount = 0 %> + <% old_location_id = 0%> + <% sub_total = 0 %> + <% count_of_void = 0 %> + <% flag = false %> + <% @sale_data.each do |sale| %> + <% credit_payment += sale[:credit_payment].to_f %> + <% card += sale[:card_amount].to_f %> + <% cash += sale[:cash_amount].to_f %> + <% credit += sale[:credit_amount].to_f %> + <% foc += sale[:foc_amount].to_f %> + <% discount += sale[:total_discount].to_f %> + <% total += sale[:grand_total].to_f %> + <% total_other_charges +=sale[:other_charges].to_f %> + <% total_tax +=sale[:total_tax].to_f %> + + <% cash_received = sale[:cash_amount].to_f + sale[:credit_payment].to_f%> + <% total_cash_received = cash.to_f + credit_payment.to_f%> + <% today_credit_payment_amount += sale[:today_credit_payment].to_f %> + + + + + + + + + + + + + + + <% total_void_amount = 0 %> + <% if !@daily_void.nil? %> + <% @daily_void.each do |d_v|%> + + <% if d_v[:daily_void_amt].to_i > 0 %> + <% if d_v[:location_id] == sale[:location_id] %> + <% if d_v[:date].utc.getlocal.strftime("%Y-%m-%d").to_s == sale[:sale_date].to_s%> + <%count_of_void+=1%> + + <%total_void_amount += d_v[:daily_void_amt].to_f%> + <% flag = true %> + + + + <%end %> + <% end%> + <% end%> + <% end%> + <% end%> + <% if flag == true%> + <% void += total_void_amount.to_f %> + + <% flag = false %> + <% end%> + <%if count_of_void == 0%> + + <%end %> + + + + +<%count_of_void= 0%> + <% count = count + 1 %> + <% end %> + + + + + + + + + + + + + + + + + +<% end %> +
Location NameDateCash SalesCredit SalesCredit ReceivedCard PaymentTotal DiscountTotal TaxesTotal Other ChargesFOC SalesVoid SalesGrand Total
<%= sale[:location].to_s rescue '-' %><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-' %><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:credit_payment].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:card_amount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:total_discount].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:total_tax].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:other_charges].to_f), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount].to_f), :delimiter => ',') %> <%= number_with_delimiter(sprintf("%.2f",total_void_amount.to_f), :delimiter => ',') %> <%= number_with_delimiter(sprintf("%.2f",0.to_f), :delimiter => ',') %> + <%= number_with_delimiter(sprintf("%.2f",((sale[:cash_amount].to_f + sale[:credit_amount].to_f + sale[:card_amount].to_f + sale[:credit_payment].to_f) - sale[:today_credit_payment].to_f) ).to_f, :delimiter => ',') %> +
Grand Total<%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",credit ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",credit_payment ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",card ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",discount ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_tax ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",total_other_charges ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",foc ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f",void ), :delimiter => ',') %><%= number_with_delimiter(sprintf("%.2f", (cash.to_f + credit.to_f + card.to_f + credit_payment.to_f) - today_credit_payment_amount.to_f ).to_f, :delimiter => ',') %>
+
+
\ No newline at end of file From 967d0350979abba96f8703db144cb92d70dc10d1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 18:31:42 +0630 Subject: [PATCH 61/71] change dob --- app/controllers/crm/customers_controller.rb | 8 ++++---- app/controllers/origami/customers_controller.rb | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index c33db2e1..525302c8 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -63,7 +63,7 @@ class Crm::CustomersController < BaseCrmController name = customer_params[:name] phone = customer_params[:contact_no] email = customer_params[:email] - date_of_birth = customer_params[:date_of_birth] + dob = customer_params[:date_of_birth] member_group_id = params[:member_group_id] membership = MembershipSetting.find_by_membership_type("paypar_url") @@ -72,7 +72,7 @@ class Crm::CustomersController < BaseCrmController url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - date_of_birth: date_of_birth, + dob: dob, member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -123,7 +123,7 @@ end name = customer_params[:name] phone = customer_params[:contact_no] email = customer_params[:email] - date_of_birth = customer_params[:date_of_birth] + dob = customer_params[:date_of_birth] id = @crm_customer.membership_id member_group_id = params[:member_group_id] @@ -133,7 +133,7 @@ end url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - date_of_birth: date_of_birth, + dob: dob, id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index a1a067fe..30ead5b0 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -28,9 +28,6 @@ class Origami::CustomersController < BaseOrigamiController # if @membership["status"] == true # @member_group = @membership["data"] # end - puts "Errrrrrrrrrrrrrrrrr" - puts @crm_customer.new_record? - respond_to do |format| # format.html { render :template => "crm/customers/index" } From e1e7064e47cc7a36b3449729fe6270a70d897f79 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 18:33:09 +0630 Subject: [PATCH 62/71] add menu in Transaction --- app/models/order.rb | 1 - app/views/layouts/_header.html.erb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 5a4d6e2d..d3a3536d 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -244,7 +244,6 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") -<<<<<<< HEAD .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bdd146b7..c5bd61e0 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -27,8 +27,8 @@
    • -
    • <%= link_to "Orders ", origami_root_path, :tabindex =>"-1" %>
      • -
    • <%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Orders ", settings_orders_path, :tabindex =>"-1" %>
      • +
    • <%= link_to "Sales ", settings_sales_path, :tabindex =>"-1" %>
  • From 92f1f80acb0167790919c28d90c1384f0f4800e8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 18:50:06 +0630 Subject: [PATCH 63/71] Edit Customer --- app/controllers/origami/customers_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 30ead5b0..14af5f49 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -28,6 +28,9 @@ class Origami::CustomersController < BaseOrigamiController # if @membership["status"] == true # @member_group = @membership["data"] # end + # puts "Errrrrrrrrrrrrrrrrr" + # puts @crm_customer.valid? + respond_to do |format| # format.html { render :template => "crm/customers/index" } From 6945449523d0247d159cf0f8a24fb274d631bd93 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 18:51:02 +0630 Subject: [PATCH 64/71] get update --- Gemfile | 2 +- Gemfile.lock | 2 ++ app/controllers/crm/customers_controller.rb | 18 +++++++------- app/models/order.rb | 27 ++++++++++----------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index b08df141..02dca6af 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -# gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6a7c6340..4235d035 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,6 +110,7 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) + pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -246,6 +247,7 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 01acd441..ad3bcc50 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -5,7 +5,7 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers.json def index filter = params[:filter] - + if filter.nil? @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) @@ -31,7 +31,7 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers/1.json def show @orders = Order.where("customer_id=?", params[:id]) - + if @orders @order_items = [] @orders.each do |bo| @@ -57,7 +57,7 @@ class Crm::CustomersController < BaseCrmController def create @crm_customers = Customer.new(customer_params) - + respond_to do |format| if @crm_customers.save name = customer_params[:name] @@ -72,7 +72,7 @@ class Crm::CustomersController < BaseCrmController url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - date_of_birth: date_of_birth, + dob: date_of_birth, member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -81,18 +81,18 @@ class Crm::CustomersController < BaseCrmController ) if response["status"] == true - + customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - + if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } else format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'} - end + end # format.json { render :index, status: :created, location: @crm_customers } else - + @crm_customers.destroy if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} @@ -103,7 +103,7 @@ class Crm::CustomersController < BaseCrmController else if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} else format.html { redirect_to crm_customers_path} format.json { render json: @crm_customers.errors, status: :unprocessable_entity } diff --git a/app/models/order.rb b/app/models/order.rb index 5a4d6e2d..20d9a7f0 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -244,21 +244,20 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") -<<<<<<< HEAD - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") end - #Origami: Cashier : to view booking order Table - def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") - .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") - .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .joins("left join orders on orders.order_id = booking_orders.order_id") - .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") - end + # #Origami: Cashier : to view booking order Table + # def self.get_booking_order_table + # booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + # bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + # .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + # .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + # .joins("left join orders on orders.order_id = booking_orders.order_id") + # .joins("left join sales on sales.sale_id = bookings.sale_id") + # .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + # .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") + # end #Origami: Cashier : to view order type Room def self.get_booking_order_rooms @@ -272,7 +271,7 @@ class Order < ApplicationRecord .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") .where("sales.sale_status<>'completed' and sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id") end #Origami: Cashier : to view order type Room From 796d511f2e659477be65fcd65c5a048382cf77ae Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:02:20 +0630 Subject: [PATCH 65/71] Rebate add --- app/models/sale_payment.rb | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b8c527af..1acd8b57 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -60,7 +60,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by) - + return false, "No outstanding Amount" end @@ -217,7 +217,7 @@ class SalePayment < ApplicationRecord self.sale.sale_status = "completed" self.sale.save! table_update_status(sObj) - rebat() + rebat(sObj) end end @@ -233,8 +233,25 @@ class SalePayment < ApplicationRecord end end - def rebat + def rebat(sObj) + food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + generic_customer_id = sObj.customer.membership_id + total_amount = sObj.total_amount + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + puts url + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) + puts response.to_json end private From 4bbf65104084e6205d375c11fb4b567e22d27047 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:31:01 +0630 Subject: [PATCH 66/71] Rebate Bug Fix --- app/models/sale_payment.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1acd8b57..04668575 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -236,14 +236,13 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - total_amount = sObj.total_amount + total_amount = food_prices receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("rebate") campaign_type_id = memberaction.additional_parameter["campaign_type_id"] app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - puts url response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, receipt_no: receipt_no}.to_json, :headers => { From c904451110a0697b50ba4e6622f9c5df96677a3b Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 19:35:05 +0630 Subject: [PATCH 67/71] update --- app/controllers/api/bill_controller.rb | 12 +++++++++--- app/controllers/origami/payments_controller.rb | 4 ++-- db/seeds.rb | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 193a4a45..a01cc717 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -8,9 +8,15 @@ class Api::BillController < Api::ApiController #create Bill by Booking ID if (params[:booking_id]) - @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) - + booking = Booking.find(params[:booking_id]) + if booking + if booking.sale_id.nil? + @sale = Sale.new + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + else + @status = true + end + end elsif (params[:order_id]) @sale = Sale.new @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 290a2911..134c9474 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -24,8 +24,8 @@ class Origami::PaymentsController < BaseOrigamiController if spay.payment_method == "cash" @cash = spay.payment_amount end - if spay.payment_method == "mpu" - @other = spay.payment_amount + if spay.payment_method == "mpu" || spay.payment_method == "paypar" + @other += spay.payment_amount end end end diff --git a/db/seeds.rb b/db/seeds.rb index 28cbe535..c802079f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -157,7 +157,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http//192.168.1.47:3006"}) + payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) From 1d1a913732ca944bdf2b4e8c5f31189c579576bd Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 20:11:37 +0630 Subject: [PATCH 68/71] bug fix for order completed --- app/assets/javascripts/cable.js | 8 ++--- app/assets/javascripts/origami.js | 16 +++++----- .../origami/discounts_controller.rb | 8 +++-- app/models/order.rb | 31 +++++++++---------- app/views/origami/home/index.html.erb | 16 +++++++++- config/routes.rb | 2 +- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js index ce5ac871..43efe3f2 100644 --- a/app/assets/javascripts/cable.js +++ b/app/assets/javascripts/cable.js @@ -6,9 +6,9 @@ //= require_tree ./channels // Temp Disable -// (function() { -// this.App || (this.App = {}); +(function() { + this.App || (this.App = {}); -// App.cable = ActionCable.createConsumer(); + App.cable = ActionCable.createConsumer(); -// }).call(this); +}).call(this); diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 4af97d29..da768fb2 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -68,11 +68,12 @@ $(document).ready(function(){ // Receipt Header receipt_no = result[i].receipt_no; cashier = result[i].cashier_name; - receipt_date = result[i].receipt_date; + receipt_date = new Date(result[i].receipt_date); + show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes() $("#receipt_no").text(receipt_no); $("#cashier").text(cashier == null ? "" : cashier); - $("#receipt_date").text(receipt_date); + $("#receipt_date").text(show_date); //Receipt Charges @@ -132,7 +133,8 @@ $(document).ready(function(){ }); // Pay Discount for Payment - $("#pay-discount").on('click', function(){ + $("#pay-discount").on('click', function(e){ + e.preventDefault(); var sale_id = $('#sale-id').text(); var sale_item_id = $('.selected-item').attr('id'); var sub_total = $('#order-sub-total').text(); @@ -140,10 +142,10 @@ $(document).ready(function(){ var discount_type = $('#discount-type').val(); var discount_value = $('#discount-amount').val(); var discount_amount = discount_value; + var ajax_url = "/origami/" + sale_id + "/discount"; - if(sale_item_id == null){ - alert('Please select item row to discount!'); - return; + if(sale_item_id != null){ + ajax_url = "/origami/" + sale_item_id + "/discount"; } // For Percentage Discount @@ -154,7 +156,7 @@ $(document).ready(function(){ var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount}; $.ajax({ type: "POST", - url: "/origami/" + sale_item_id + "/discount", + url: ajax_url, data: params, success:function(result){ } }); diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index e80ca348..fb981a80 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -30,13 +30,15 @@ class Origami::DiscountsController < BaseOrigamiController sale.save #save sale item for discount - origin_sale_item = SaleItem.find(sale_item_id) + if sale_item_id != nil + origin_sale_item = SaleItem.find(sale_item_id) + end sale_item = SaleItem.new #pull sale_item.sale_id = sale_id - sale_item.product_code = origin_sale_item.product_code - sale_item.product_name = origin_sale_item.product_name + " Discount" + sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id + sale_item.product_name = "Overall Discount" sale_item.remark = remark sale_item.qty = 1 diff --git a/app/models/order.rb b/app/models/order.rb index d3a3536d..0c00ea84 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -223,7 +223,7 @@ class Order < ApplicationRecord #Origami: Cashier : to view booking order Table def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") @@ -232,7 +232,6 @@ class Order < ApplicationRecord .joins("left join sales on sales.sale_id = bookings.sale_id") .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") - end #Origami: Cashier : to view booking order Table @@ -248,20 +247,20 @@ class Order < ApplicationRecord end #Origami: Cashier : to view booking order Table - def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") - .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") - .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .joins("left join orders on orders.order_id = booking_orders.order_id") - .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") - end + # def self.get_booking_order_table + # booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + # bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + # .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + # .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + # .joins("left join orders on orders.order_id = booking_orders.order_id") + # .joins("left join sales on sales.sale_id = bookings.sale_id") + # .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + # .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") + # end #Origami: Cashier : to view order type Room def self.get_booking_order_rooms - booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, + booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, bookings.booking_id,orders.customer_id as customer_id, sales.sale_id as sale_id,dining_facilities.name as room_name") @@ -270,7 +269,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'completed' and sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) + .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") end @@ -291,7 +290,7 @@ class Order < ApplicationRecord def self.get_orders from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc - orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, + orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.order_id = orders.order_id @@ -300,7 +299,7 @@ class Order < ApplicationRecord left join order_items on order_items.order_id = orders.order_id left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'completed' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id,orders.customer_id") end diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 0332fa12..77fb4df0 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -87,6 +87,11 @@
    <% @booking_orders.each do |bko| + # No Show completed + if bko.sale_status == 'completed' + next + end + # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -145,6 +150,11 @@
    <% @booking_rooms.each do |rmo| + # No Show completed + if rmo.sale_status == 'completed' + next + end + # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -204,6 +214,10 @@
    <% @orders.each do |odr| + # No Show completed + if odr.sale_status == 'completed' + next + end # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -319,7 +333,7 @@ sub_total = 0 if @selected_item_type == "Order" @selected_item.order_items.each do |order_item| - sub_total += order_item.qty*order_item.unit_price + sub_total += (order_item.qty*order_item.unit_price) %> <%= order_item.item_name %> diff --git a/config/routes.rb b/config/routes.rb index 3b15f5dd..76e1498c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ Rails.application.routes.draw do mount Sidekiq::Web => '/kiq' # Action Cable Creation - # mount ActionCable.server => "/cable" + mount ActionCable.server => "/cable" #--------- SmartSales Installation ------------# get 'install' => 'install#index' From a8a8c2b984f5de4a5164217d74e42a5dbcaaa2f8 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 20:15:26 +0630 Subject: [PATCH 69/71] update --- app/views/origami/home/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 0332fa12..5ee5ae3e 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -60,7 +60,7 @@ -

    <%= cpo.table_name %>

    +

    <%= cpo.table_name %>

    Receipt No : @@ -96,7 +96,7 @@ unique_id=bko.booking_id customer_id=bko.order_customer_id # check selected item and assign - if @selected_item != nil + if !@selected_item.nil? if bko.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" end From 29acbd9bfa8eef7f0c03b74fa4fae044ca005844 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 20:32:12 +0630 Subject: [PATCH 70/71] Rebate Redeem amount detect --- app/models/sale_payment.rb | 41 +++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 04668575..ffe881e6 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -236,21 +236,34 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - total_amount = food_prices - receipt_no = sObj.receipt_no - membership = MembershipSetting.find_by_membership_type("paypar_url") - memberaction = MembershipAction.find_by_membership_type("rebate") - campaign_type_id = memberaction.additional_parameter["campaign_type_id"] - app_token = membership.auth_token.to_s - url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, - receipt_no: receipt_no}.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }) + if generic_customer_id != nil || generic_customer_id != "" + paypar = sObj.sale_payments + payparcost = 0 + paypar.each do |pp| + if pp.payment_method == "paypar" + payparcost = payparcost + pp.payment_amount + end + end + total_amount = food_prices - payparcost + puts "aaaa" + puts food_prices + puts payparcost + puts total_amount + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) - puts response.to_json + puts response.to_json + end end private From 3404c5e0bd29fb96222371ce977224562f9f5172 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 13 Jun 2017 09:59:56 +0630 Subject: [PATCH 71/71] ui updating for report --- app/controllers/base_report_controller.rb | 75 ++++++++++++++++++- .../reports/daily_sale_controller.rb | 21 ++++++ .../reports/receipt_no_controller.rb | 72 +----------------- app/views/origami/home/index.html.erb | 4 +- app/views/reports/daily_sale_report.html.erb | 0 .../_shift_sale_report_filter.html.erb | 1 + app/views/reports/receipt_no/index.html.erb | 1 + 7 files changed, 98 insertions(+), 76 deletions(-) create mode 100644 app/controllers/reports/daily_sale_controller.rb create mode 100644 app/views/reports/daily_sale_report.html.erb diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb index 77e38f2c..c1ae1a01 100644 --- a/app/controllers/base_report_controller.rb +++ b/app/controllers/base_report_controller.rb @@ -1,8 +1,77 @@ class BaseReportController < ActionController::Base - include LoginVerification + include LoginVerification + layout "application" - #before_action :check_installation - protect_from_forgery with: :exception + #before_action :check_installation + protect_from_forgery with: :exception + PERIOD = { + "today" => 0, + "yesterday" => 1, + "this_week" => 2, + "last_week" => 3, + "last_7" => 4, + "this_month" => 5, + "last_month" => 6, + "last_30" => 7, + "this_year" => 8, + "last_year" => 9 + } + + def get_date_range_from_params + period_type = params[:period_type] + period = params[:period] + from = params[:from] + to = params[:to] + day_ref = Time.now + if period_type.to_i == 1 + if params[:from] && params[:to] + if params[:from] != "" && params[:to] !="" + from = DateTime.strptime(params[:from], "%m/%d/%Y") + to = DateTime.strptime(params[:to], "%m/%d/%Y") + else + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + end + end + else + case period.to_i + when PERIOD["today"] + + from = day_ref.beginning_of_day.utc + to = day_ref.end_of_day.utc + + when PERIOD["yesterday"] + from = (day_ref - 1.day).beginning_of_day.utc + to = (day_ref - 1.day).end_of_day.utc + + when PERIOD["this_week"] + from = Time.now.beginning_of_week.utc + to = Time.now.utc + when PERIOD["last_week"] + from = (day_ref - 7.day).beginning_of_week.utc + to = (day_ref - 7.day).end_of_week.utc + when PERIOD["last_7"] + from = (day_ref - 7.day).utc + to = Time.now.utc + when PERIOD["this_month"] + from = Time.now.beginning_of_month.utc + to = Time.now.utc + when PERIOD["last_month"] + from = (day_ref - 1.month).beginning_of_month.utc + to = (day_ref - 1.month).end_of_month.utc + when PERIOD["last_30"] + from = (day_ref - 30.day).utc + to = Time.now.utc + when PERIOD["this_year"] + from = Time.now.beginning_of_year.utc + to = Time.now.utc + when PERIOD["last_year"] + from = (day_ref - 1.year).beginning_of_year.utc + to = (day_ref - 1.year).end_of_year.utc + end + end + return from, to + end end diff --git a/app/controllers/reports/daily_sale_controller.rb b/app/controllers/reports/daily_sale_controller.rb new file mode 100644 index 00000000..b4c701ae --- /dev/null +++ b/app/controllers/reports/daily_sale_controller.rb @@ -0,0 +1,21 @@ +class Reports::DailySaleController < BaseReportController + PERIOD = { + "today" => 0, + "yesterday" => 1, + "this_week" => 2, + "last_week" => 3, + "last_7" => 4, + "this_month" => 5, + "last_month" => 6, + "last_30" => 7, + "this_year" => 8, + "last_year" => 9 + } + + def index + from, to = get_date_range_from_params + @sale_data = Sale.get_receipt_no_list(from,to) + @sale_data = Kaminari.paginate_array(@sale_data).page(params[:page]).per(50) +end + +end \ No newline at end of file diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 930659b9..8569c051 100644 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -1,17 +1,4 @@ -class Reports::ReceiptNoController < ApplicationController - PERIOD = { - "today" => 0, - "yesterday" => 1, - "this_week" => 2, - "last_week" => 3, - "last_7" => 4, - "this_month" => 5, - "last_month" => 6, - "last_30" => 7, - "this_year" => 8, - "last_year" => 9 - } - +class Reports::ReceiptNoController < BaseReportController def index from, to = get_date_range_from_params puts "from..." @@ -25,61 +12,4 @@ class Reports::ReceiptNoController < ApplicationController def show end - - private - def get_date_range_from_params - period_type = params[:period_type] - period = params[:period] - from = params[:from] - to = params[:to] - day_ref = Time.now - if period_type.to_i == 1 - if params[:from] && params[:to] - if params[:from] != "" && params[:to] !="" - from = DateTime.strptime(params[:from], "%m/%d/%Y") - to = DateTime.strptime(params[:to], "%m/%d/%Y") - else - from = day_ref.beginning_of_day.utc - to = day_ref.end_of_day.utc - end - end - else - case period.to_i - when PERIOD["today"] - - from = day_ref.beginning_of_day.utc - to = day_ref.end_of_day.utc - - when PERIOD["yesterday"] - from = (day_ref - 1.day).beginning_of_day.utc - to = (day_ref - 1.day).end_of_day.utc - - when PERIOD["this_week"] - from = Time.now.beginning_of_week.utc - to = Time.now.utc - when PERIOD["last_week"] - from = (day_ref - 7.day).beginning_of_week.utc - to = (day_ref - 7.day).end_of_week.utc - when PERIOD["last_7"] - from = (day_ref - 7.day).utc - to = Time.now.utc - when PERIOD["this_month"] - from = Time.now.beginning_of_month.utc - to = Time.now.utc - when PERIOD["last_month"] - from = (day_ref - 1.month).beginning_of_month.utc - to = (day_ref - 1.month).end_of_month.utc - when PERIOD["last_30"] - from = (day_ref - 30.day).utc - to = Time.now.utc - when PERIOD["this_year"] - from = Time.now.beginning_of_year.utc - to = Time.now.utc - when PERIOD["last_year"] - from = (day_ref - 1.year).beginning_of_year.utc - to = (day_ref - 1.year).end_of_year.utc - end - end - return from, to - end end \ No newline at end of file diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 77fb4df0..3477364a 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -316,7 +316,7 @@ sub_total = 0 if @selected_item_type == "Sale" @selected_item.sale_items.each do |sale_item| - sub_total += sale_item.qty*sale_item.unit_price + sub_total += (sale_item.qty*sale_item.unit_price) %> <%= sale_item.product_name %> @@ -351,7 +351,7 @@ - +
    Sub Total:<%=sub_total%><%= sub_total %>