diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b0937554..202d4387 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,6 +17,8 @@ //= require turbolinks //= require cable //= require settings/processing_items +//= require jquery-ui +//= require bootstrap-datepicker $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); @@ -153,4 +155,3 @@ $(function(){ } }); */ ->>>>>>> d54fd19d1c18384ee6b21c43ca51587fb7fa843f diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index e69de29b..00000000 diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index bed2e04f..a4fa6b9f 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,6 +2,8 @@ @import "bootstrap"; @import "font-awesome"; @import "theme"; +@import "jquery-ui"; +@import "bootstrap-datepicker3"; /* Show it is fixed to the top */ diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index e3fc7378..3215f9e6 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -10,8 +10,6 @@ class Origami::CustomersController < BaseOrigamiController def show end - - def add_customer @sale_id = params[:sale_id] diff --git a/app/controllers/settings/orders_controller.rb b/app/controllers/settings/orders_controller.rb deleted file mode 100644 index b5bbdc1c..00000000 --- a/app/controllers/settings/orders_controller.rb +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index aabc2282..00000000 --- a/app/controllers/settings/sales_controller.rb +++ /dev/null @@ -1,32 +0,0 @@ -class Settings::SalesController < ApplicationController - def index - - search_date = params[:date] - receipt_no = params[:receipt_no] - today = Date.today - - if receipt_no.nil? - @sales = Sale.order("sale_id").page(params[:page]) - #@products = Product.order("name").page(params[:page]).per(5) - else - @sales = Sale.where("receipt_no LIKE ?", "%#{receipt_no}%").order("receipt_no").page(params[:page]) - 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/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index ea9e8ccd..edafb1db 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -4,12 +4,34 @@ class Transactions::SalesController < ApplicationController # GET /transactions/sales # GET /transactions/sales.json def index - @transactions_sales = Sale.all + + search_date = params[:date] + receipt_no = params[:receipt_no] + today = Date.today + + if receipt_no.nil? + @sales = Sale.order("sale_id").page(params[:page]) + #@products = Product.order("name").page(params[:page]).per(5) + else + @sales = Sale.search(receipt_no) + 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 # GET /transactions/sales/1 # GET /transactions/sales/1.json 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 # GET /transactions/sales/new diff --git a/app/models/order.rb b/app/models/order.rb index 21c00580..10c1a6c2 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -292,6 +292,15 @@ class Order < ApplicationRecord end + def self.search(search) + if search + # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) + where("order_id LIKE ?", "%#{search}%") + else + find(:all) + end + end + private def generate_custom_id diff --git a/app/models/sale.rb b/app/models/sale.rb index c0a73f3d..681bed64 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -261,7 +261,8 @@ class Sale < ApplicationRecord def self.search(search) if search - find(:all, :conditions => ['receipt_no LIKE ?', "%#{search}%"]) + # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"]) + where("receipt_no LIKE ?", "%#{search}%",) else find(:all) end diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 17f207c3..f3819466 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -25,8 +25,8 @@ <%= form_tag crm_customers_path, :method => :get do %> -
- +
+
<% end %> @@ -44,9 +44,9 @@ <% if @crm_customers.count > 0 %> <% @crm_customers.each do |crm_customer| %> - + - + <%= crm_customer.name %> <%= crm_customer.company rescue '-' %> <%= crm_customer.contact_no %> @@ -117,8 +117,9 @@ <%end%>
- - Back +
+ + Back
@@ -135,11 +136,10 @@ $(function() { $('.datepicker').css('cursor','pointer'); }); - $(document).on('click',".checkbox_check",function(){ - if(this.checked){ - + $(document).on('click',".customer_tr",function(){ + // if(this.checked){ var sale_id = $("#sale_id").val() || 0; - var customer_id = $(this).val(); + var customer_id = $(this).attr('data-ref'); if(sale_id != 0){ // var url = "/"+customer_id; @@ -178,9 +178,9 @@ $(function() { //$(".edit_customer").attr('method', 'PATCH'); } }); - }else{ + // }else{ - } + // } }) function update_sale(customer_id,sale_id) { @@ -205,7 +205,6 @@ $(function() { success: function(data) { if(data.status == true) { - alert('Customer has assigned'); window.location.href = '/origami' }else{ alert('Record not found!'); diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 62ebf9c0..e3530017 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -1,120 +1,130 @@
-
-
    -
  1. Home
    2. -
  2. - Customer -
    3. -
  3. Details -
    4. -
-
-
+
+ + + + -
-
- -
-
-
- - - - - - - - - - - - - +
-
- - - - - - - - - <% -puts "hhhhhhhhhhhhhhhhhhhhh" - puts @member_data.to_json %> - - -
NameEmailContact noCompanyDate Of BirthMembership AccountBalanceType
<%= @crm_customer.name %><%= @crm_customer.email %><%= @crm_customer.contact_no %><%= @crm_customer.company %><%= @crm_customer.date_of_birth %> <%= @balance %> <%= @type %>
-
-

Order Items

+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Name<%= @crm_customer.name %>
Email<%= @crm_customer.email %>
Contact no<%= @crm_customer.contact_no %>
Company<%= @crm_customer.company %>
Date Of Birth<%= @crm_customer.date_of_birth %>
+
+
- - - - - - - - - - - - +
+

Order Details

+
+
Created at Menu ItemQTYUnit Price OptionStatusWaiter
+ + + + + + + + + + + + - - <% @order_items.each do |order_item| %> - - - - - - - - - - <% end %> - -
Order IDMenu ItemQTYUnit Price OptionStatusWaiterCreated at
<%= 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 %>
+ + <% @order_items.each do |order_item| %> + + <%= order_item.order_id %> + <%= order_item.item_name %> + <%= order_item.qty %> + <%= order_item.price %> + <%= order_item.options %> + <%= order_item.order_item_status %> + <%= order_item.item_order_by %> + <%= order_item.created_at.strftime("%d-%m-%y") %> + + <% end %> + + +
+
-

Sale Items

+
+

Sale Details

+
+ + + + + + + + + + + -
Sale ID Menu ItemQTYUnit Price Tax PriceCreated At
- - - - - - - - - - + + <% @sale_items.each do |sale_item| %> + + + + + + + + + + <% end %> + +
Sale ID Menu ItemQTYUnit Price Tax PriceCreated At
<%= sale_item.sale_id %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.unit_price %><%= sale_item.taxable_price %><%= sale_item.created_at %>
+
+
- - <% @sale_items.each do |sale_item| %> - - <%= sale_item.sale_id %> - <%= sale_item.product_name %> - <%= sale_item.qty %> - <%= sale_item.unit_price %> - - <%= sale_item.taxable_price %> - <%= sale_item.created_at %> - - <% end %> - -
-
-
+ +
+

+ + Back + +
- - - diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 4a74c7b1..58ecd9b5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -28,8 +28,8 @@
  • diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index ba6ff75c..1c6bebaa 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -26,8 +26,8 @@ <% path ="/origami/#{@sale_id}/customers" %> <%= form_tag path, :method => :get do %> -
    - +
    +
    <% end %> @@ -45,9 +45,9 @@ <% if @crm_customers.count > 0 %> <% @crm_customers.each do |crm_customer| %> - + - + <%= crm_customer.name %> <%= crm_customer.company rescue '-' %> <%= crm_customer.contact_no %> @@ -115,8 +115,9 @@ <%end%>
    - - Back +
    +     + Back
    @@ -133,11 +134,11 @@ $('.datepicker').css('cursor','pointer'); }); - $(document).on('click',".checkbox_check",function(){ - if(this.checked){ + $(document).on('click',".customer_tr",function(){ + // if(this.checked){ var sale_id = $("#sale_id").val() || 0; - var customer_id = $(this).val(); + var customer_id = $(this).attr('data-ref'); if(sale_id != 0){ // var url = "/"+customer_id; @@ -176,9 +177,9 @@ //$(".edit_customer").attr('method', 'PATCH'); } }); - }else{ + // }else{ - } + // } }) function update_sale(customer_id,sale_id) { diff --git a/app/views/settings/orders/index.html.erb b/app/views/settings/orders/index.html.erb deleted file mode 100644 index bd3df8fb..00000000 --- a/app/views/settings/orders/index.html.erb +++ /dev/null @@ -1,68 +0,0 @@ -
    -
    -
      -
    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 deleted file mode 100644 index bd17dadb..00000000 --- a/app/views/settings/orders/show.html.erb +++ /dev/null @@ -1,85 +0,0 @@ -
    -
    -
      -
    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 deleted file mode 100644 index 0909fdef..00000000 --- a/app/views/settings/sales/index.html.erb +++ /dev/null @@ -1,84 +0,0 @@ -
    -
    -
      -
    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) %>
    -
    - -
    -
    - -
    -
    - - - - - - - diff --git a/app/views/settings/sales/show.html.erb b/app/views/settings/sales/show.html.erb deleted file mode 100644 index 484de762..00000000 --- a/app/views/settings/sales/show.html.erb +++ /dev/null @@ -1,103 +0,0 @@ -
    -
    -
      -
    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/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index c39b0ac3..a50bf56b 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -1,59 +1,84 @@ -

    <%= notice %>

    +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. + +
    +
    +
    -

    Transactions Sales

    +
    +
    +
    +
    + + + + + + + + + + + + + + + + -
    + <%= form_tag transactions_sales_path, :method => :get do %> +
    + + + + +
    + <% end %> +
    Sale Id Receipt no Grand totalTax amountCashierSales statusReceipt DateAction
    - - - - - - - - - - - - - - - - - - - - - - + + <% @sales.each do |sale| %> - - <% @transactions_sales.each do |transactions_sale| %> - - - - - - - - - - - - - - - - - - - - - - - <% end %> - -
    CashierCashier nameRequested byRequested atReceipt noReceipt dateCustomerPayment statusSale statusTotal amountTotal discountTotal taxTax typeGrand totalRounding adjustmentAmount receivedAmount changed
    <%= transactions_sale.cashier %><%= transactions_sale.cashier_name %><%= transactions_sale.requested_by %><%= transactions_sale.requested_at %><%= transactions_sale.receipt_no %><%= transactions_sale.receipt_date %><%= transactions_sale.customer %><%= transactions_sale.payment_status %><%= transactions_sale.sale_status %><%= transactions_sale.total_amount %><%= transactions_sale.total_discount %><%= transactions_sale.total_tax %><%= transactions_sale.tax_type %><%= transactions_sale.grand_total %><%= transactions_sale.rounding_adjustment %><%= transactions_sale.amount_received %><%= transactions_sale.amount_changed %><%= link_to 'Show', transactions_sale %><%= link_to 'Edit', edit_transactions_sale_path(transactions_sale) %><%= link_to 'Destroy', transactions_sale, method: :delete, data: { confirm: 'Are you sure?' } %>
    + + <%= 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', transactions_sale_path(sale) %> + + <% end %> + + +
    + +
    +
    -
    +
    +
    + + + + + + -<%= link_to 'New Transactions Sale', new_transactions_sale_path %> diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index c82c2c5e..484de762 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -1,89 +1,103 @@ -

    <%= notice %>

    +
    +
    +
      +
    1. Home
      2. +
    2. + Sale +
      3. +
    3. + <%= @sale.sale_id %> +
      4. +
    +
    +
    +
    -

    - Cashier: - <%= @transactions_sale.cashier %> -

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

    - Cashier name: - <%= @transactions_sale.cashier_name %> -

    + + + + + + + + + + + + + + + + <% @sale.sale_items.each do |s| %> -

    - Requested by: - <%= @transactions_sale.requested_by %> -

    + + + + + + + + <% end %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

    - Requested at: - <%= @transactions_sale.requested_at %> -

    + +
    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 + +
    +
    -

    - Receipt no: - <%= @transactions_sale.receipt_no %> -

    +
    +
    -

    - Receipt date: - <%= @transactions_sale.receipt_date %> -

    -

    - Customer: - <%= @transactions_sale.customer %> -

    -

    - Payment status: - <%= @transactions_sale.payment_status %> -

    + -

    - Sale status: - <%= @transactions_sale.sale_status %> -

    - -

    - Total amount: - <%= @transactions_sale.total_amount %> -

    - -

    - Total discount: - <%= @transactions_sale.total_discount %> -

    - -

    - Total tax: - <%= @transactions_sale.total_tax %> -

    - -

    - Tax type: - <%= @transactions_sale.tax_type %> -

    - -

    - Grand total: - <%= @transactions_sale.grand_total %> -

    - -

    - Rounding adjustment: - <%= @transactions_sale.rounding_adjustment %> -

    - -

    - Amount received: - <%= @transactions_sale.amount_received %> -

    - -

    - Amount changed: - <%= @transactions_sale.amount_changed %> -

    - -<%= link_to 'Edit', edit_transactions_sale_path(@transactions_sale) %> | -<%= link_to 'Back', transactions_sales_path %> diff --git a/config/routes.rb b/config/routes.rb index 2199ad67..a0da05ae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -173,10 +173,6 @@ Rails.application.routes.draw do resources :tax_profiles #lookups resources :lookups - #orders - resources :orders - #sales - resources :sales #cashier_terminals resources :cashier_terminals #order_job_stations @@ -201,6 +197,7 @@ Rails.application.routes.draw do #--------- Transactions Sections ------------# namespace :transactions do resources :sales + resources :orders end #--------- Reports Controller Sections ------------#