From 1af178fecba344792d0851898607a570a93a3202 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Tue, 22 Aug 2017 09:51:08 +0630 Subject: [PATCH 1/2] update ui commission & commissioner --- .idea/.generators | 2 +- .idea/sxrestaurant.iml | 1 + .idea/workspace.xml | 363 ++++++++++-------- .../origami/commissions_controller.rb | 2 +- .../origami/commissioners/_form.html.erb | 28 +- app/views/origami/commissioners/edit.html.erb | 4 +- .../origami/commissioners/index.html.erb | 2 +- app/views/origami/commissioners/new.html.erb | 4 +- app/views/origami/commissioners/show.html.erb | 54 ++- app/views/origami/commissions/_form.html.erb | 12 +- app/views/origami/commissions/edit.html.erb | 6 +- app/views/origami/commissions/index.html.erb | 2 +- app/views/origami/commissions/new.html.erb | 18 +- app/views/origami/commissions/show.html.erb | 56 +-- 14 files changed, 315 insertions(+), 239 deletions(-) diff --git a/.idea/.generators b/.idea/.generators index 8893e668..98526fe7 100644 --- a/.idea/.generators +++ b/.idea/.generators @@ -5,4 +5,4 @@ You are allowed to: 2. Remove generators 3. Add installed generators To add new installed generators automatically delete this file and reload the project. ---> +--> diff --git a/.idea/sxrestaurant.iml b/.idea/sxrestaurant.iml index f88608e6..e1c0cfaa 100644 --- a/.idea/sxrestaurant.iml +++ b/.idea/sxrestaurant.iml @@ -181,6 +181,7 @@ + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b41a365d..fdfb3e9b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,26 +2,20 @@ - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + @@ -38,21 +32,11 @@ - - + + - - - - - - - - - - - - + + @@ -61,28 +45,38 @@ - - + + - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + @@ -91,48 +85,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -179,9 +173,16 @@ @@ -192,10 +193,10 @@ DEFINITION_ORDER - @@ -215,22 +216,8 @@ - - - - - - - - - - - + @@ -347,6 +334,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -784,22 +811,23 @@ - + + - - + - + - + @@ -826,10 +854,6 @@ - - - - @@ -867,14 +891,6 @@ - - - - - - - - @@ -925,6 +941,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -945,90 +984,106 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - + - - + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/commissions_controller.rb b/app/controllers/origami/commissions_controller.rb index f0f07d2a..fdd1bf73 100644 --- a/app/controllers/origami/commissions_controller.rb +++ b/app/controllers/origami/commissions_controller.rb @@ -1,5 +1,5 @@ class Origami::CommissionsController < BaseOrigamiController - # before_action :set_commission, only: [:show, :edit, :update, :destroy] + before_action :set_commission, only: [:show, :edit, :update, :destroy] # GET /commissions # GET /commissions.json diff --git a/app/views/origami/commissioners/_form.html.erb b/app/views/origami/commissioners/_form.html.erb index 6386b0f7..4c2a17f8 100644 --- a/app/views/origami/commissioners/_form.html.erb +++ b/app/views/origami/commissioners/_form.html.erb @@ -1,14 +1,18 @@ -<%= simple_form_for([:origami,@commissioner]) do |f| %> - <%= f.error_notification %> +
+ <%= simple_form_for([:origami, @commissioner]) do |f| %> + <%= f.error_notification %> -
- <%= f.input :name %> - <%= f.collection_select :emp_id, Employee.all.order('name asc'), :emp_id, :name, {prompt: "Select an Employee"}, {class: "form-control"} %> - <%= f.input :commission_type %> - -
+
+ <%= f.input :name %> + <%= f.label :emp_id %> + <%= f.collection_select :emp_id, Employee.all.order('name asc'), :emp_id, :name, {prompt: "Select an Employee"}, {class: "form-control"} %>
+ <%= f.input :commission_type %> + +
-
- <%= f.button :submit %> -
-<% end %> +
+ <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %> + <%= f.button :submit, class: 'btn btn-info' %> +
+ <% end %> +
diff --git a/app/views/origami/commissioners/edit.html.erb b/app/views/origami/commissioners/edit.html.erb index 0a2edab4..ea5c44cd 100644 --- a/app/views/origami/commissioners/edit.html.erb +++ b/app/views/origami/commissioners/edit.html.erb @@ -1,10 +1,10 @@
<%= render 'form', commissioner: @commissioner %> -
\ No newline at end of file + diff --git a/app/views/origami/commissioners/index.html.erb b/app/views/origami/commissioners/index.html.erb index e7230fd9..baadb225 100644 --- a/app/views/origami/commissioners/index.html.erb +++ b/app/views/origami/commissioners/index.html.erb @@ -1,6 +1,6 @@
    -
  • Home
    • +
  • Home
  • Commissioner
    • <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commissioner_path ,:class => 'btn btn-primary btn-sm' %> diff --git a/app/views/origami/commissioners/new.html.erb b/app/views/origami/commissioners/new.html.erb index 55b9b98c..ea737022 100644 --- a/app/views/origami/commissioners/new.html.erb +++ b/app/views/origami/commissioners/new.html.erb @@ -1,10 +1,10 @@
    <%= render 'form', commissioner: @commissioner %> -
    \ No newline at end of file +
diff --git a/app/views/origami/commissioners/show.html.erb b/app/views/origami/commissioners/show.html.erb index 579c9c0d..83d5442b 100644 --- a/app/views/origami/commissioners/show.html.erb +++ b/app/views/origami/commissioners/show.html.erb @@ -1,11 +1,11 @@
-
@@ -14,25 +14,37 @@ - Name<%= @commissioner.name %> - Employee Name - - <% if Employee.exists? %> - <% employee = Employee.where('emp_id=?',@commissioner.emp_id) %> - <%= employee[0].name %> - <% end %> - - - Commission Type<%= @commissioner.commission_type %> - Active<%= @commissioner.is_active %> - Created By<%= Employee.find(@commissioner.created_by).name %> - - - <%= link_to 'Edit', edit_origami_commissioner_path(@commissioner) %><%= link_to 'Destroy', origami_commissioner_path(@commissioner), method: :delete, data: { confirm: 'Are you sure?' } %> - + + Name + <%= @commissioner.name %> + + + Employee Name + + <% if Employee.exists? %> + <% employee = Employee.where('emp_id=?', @commissioner.emp_id) %> + <%= employee[0].name %> + <% end %> + + + + Commission Type + <%= @commissioner.commission_type %> + + + Active + <%= @commissioner.is_active %> + + + Created By + <%= Employee.find(@commissioner.created_by).name %> + + <%= link_to 'Back', origami_commissioners_path, class: 'btn btn-success' %> + <%= link_to 'Edit', edit_origami_commissioner_path(@commissioner), class: 'btn btn-info' %> + <%= link_to 'Destroy', origami_commissioner_path(@commissioner), method: :delete, data: {confirm: 'Are you sure?'}, class: 'btn btn-danger' %>
diff --git a/app/views/origami/commissions/_form.html.erb b/app/views/origami/commissions/_form.html.erb index 826dbf78..a5c0d2c0 100644 --- a/app/views/origami/commissions/_form.html.erb +++ b/app/views/origami/commissions/_form.html.erb @@ -1,15 +1,17 @@ +
<%= simple_form_for([:origami,@commission]) do |f| %> <%= f.error_notification %>
- <%= f.collection_select :product_id, Product.all.order('name asc'), :id, :name, {prompt: "Select a Product"}, {class: "form-control"} %> + <%= f.label :product_id %> + <%= f.collection_select :product_id, Product.all.order('name asc'), :id, :name, {prompt: "Select a Product"}, {class: "form-control"} %>
<%= f.input :amount %> - <%= f.input :commission_type, :collection => [:percentage,:net_amount] %> + <%= f.input :commission_type, :collection => [:percentage, :net_amount] %>
-
- <%= f.button :submit %> + <%= link_to 'Back', origami_commissions_path, class: 'btn btn-success' %> + <%= f.button :submit, class: 'btn btn-info' %>
<% end %> - \ No newline at end of file +
diff --git a/app/views/origami/commissions/edit.html.erb b/app/views/origami/commissions/edit.html.erb index da73332f..f3b72f3d 100644 --- a/app/views/origami/commissions/edit.html.erb +++ b/app/views/origami/commissions/edit.html.erb @@ -1,10 +1,10 @@
<%= render 'form', commission: @commission %> -
\ No newline at end of file + diff --git a/app/views/origami/commissions/index.html.erb b/app/views/origami/commissions/index.html.erb index 420920b9..e5a83639 100644 --- a/app/views/origami/commissions/index.html.erb +++ b/app/views/origami/commissions/index.html.erb @@ -1,6 +1,6 @@
    -
  • Home
    • +
  • Home
  • Commissions
    • <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_commission_path ,:class => 'btn btn-primary btn-sm' %> diff --git a/app/views/origami/commissions/new.html.erb b/app/views/origami/commissions/new.html.erb index 8b6e32ca..a13c8cb3 100644 --- a/app/views/origami/commissions/new.html.erb +++ b/app/views/origami/commissions/new.html.erb @@ -1,10 +1,10 @@
    -
    - -
    - <%= render 'form', commission: @commission %> -
    \ No newline at end of file +
    + +
    + <%= render 'form', commission: @commission %> +
diff --git a/app/views/origami/commissions/show.html.erb b/app/views/origami/commissions/show.html.erb index 6eb399af..da04710e 100644 --- a/app/views/origami/commissions/show.html.erb +++ b/app/views/origami/commissions/show.html.erb @@ -1,43 +1,45 @@

<%= notice %>

-<%= link_to 'Edit', edit_commission_path(@commission) %> | -<%= link_to 'Back', commissions_path %> - -
-

Commission

- - - - - - - - - - - - + + + + + + + + + + + + + + + +
Product Name - <% if Product.exists? %> - <% product = Product.find(@commission.product_id) %> - <%= product.name %> - <% end %> - -
Amount<%= @commission.amount %>
Commission Type<%= @commission.commission_type %>
Active<%= @commission.is_active %>
<%= link_to 'Edit', edit_origami_commission_path(@commission) %><%= link_to 'Destroy', origami_commission_path(@commission), method: :delete, data: { confirm: 'Are you sure?' } %>
Product Name + <% if Product.exists? %> + <% product = Product.find(@commission.product_id) %> + <%= product.name %> + <% end %> +
Amount<%= @commission.amount %>
Commission Type<%= @commission.commission_type %>
Active<%= @commission.is_active %>
+ <%= link_to 'Back', origami_commissions_path, class: 'btn btn-success' %> + <%= link_to 'Edit', edit_origami_commission_path(@commission), class: 'btn btn-info' %> + <%= link_to 'Destroy', origami_commission_path(@commission), method: :delete, class: 'btn btn-danger', data: {confirm: 'Are you sure?'} %>
From 74c2955ef0faaa3eac09df4667ee88a0ae4149c9 Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Tue, 22 Aug 2017 11:08:49 +0630 Subject: [PATCH 2/2] create productCommission --- .idea/workspace.xml | 300 +++-- .../origami/product_commissions_controller.rb | 74 ++ .../origami/product_commissions_helper.rb | 2 + app/models/product_commission.rb | 2 + app/views/home/dashboard.html.erb | 27 +- app/views/home/index.html.erb | 197 ++-- app/views/layouts/_header.html.erb | 2 +- app/views/origami/home/show.html.erb | 1049 +++++++++-------- .../product_commissions/_form.html.erb | 10 + .../_product_commission.json.jbuilder | 2 + .../origami/product_commissions/edit.html.erb | 6 + .../product_commissions/index.html.erb | 25 + .../product_commissions/index.json.jbuilder | 1 + .../origami/product_commissions/new.html.erb | 5 + .../origami/product_commissions/show.html.erb | 4 + .../product_commissions/show.json.jbuilder | 1 + ...170822034139_create_product_commissions.rb | 12 + .../product_commissions_controller_spec.rb | 141 +++ .../product_commissions_helper_spec.rb | 15 + spec/models/product_commission_spec.rb | 5 + .../origami_product_commissions_spec.rb | 10 + .../product_commissions_routing_spec.rb | 39 + .../product_commissions/edit.html.erb_spec.rb | 14 + .../index.html.erb_spec.rb | 14 + .../product_commissions/new.html.erb_spec.rb | 14 + .../product_commissions/show.html.erb_spec.rb | 11 + 26 files changed, 1187 insertions(+), 795 deletions(-) create mode 100644 app/controllers/origami/product_commissions_controller.rb create mode 100644 app/helpers/origami/product_commissions_helper.rb create mode 100644 app/models/product_commission.rb create mode 100644 app/views/origami/product_commissions/_form.html.erb create mode 100644 app/views/origami/product_commissions/_product_commission.json.jbuilder create mode 100644 app/views/origami/product_commissions/edit.html.erb create mode 100644 app/views/origami/product_commissions/index.html.erb create mode 100644 app/views/origami/product_commissions/index.json.jbuilder create mode 100644 app/views/origami/product_commissions/new.html.erb create mode 100644 app/views/origami/product_commissions/show.html.erb create mode 100644 app/views/origami/product_commissions/show.json.jbuilder create mode 100644 db/migrate/20170822034139_create_product_commissions.rb create mode 100644 spec/controllers/origami/product_commissions_controller_spec.rb create mode 100644 spec/helpers/origami/product_commissions_helper_spec.rb create mode 100644 spec/models/product_commission_spec.rb create mode 100644 spec/requests/origami/origami_product_commissions_spec.rb create mode 100644 spec/routing/origami/product_commissions_routing_spec.rb create mode 100644 spec/views/origami/product_commissions/edit.html.erb_spec.rb create mode 100644 spec/views/origami/product_commissions/index.html.erb_spec.rb create mode 100644 spec/views/origami/product_commissions/new.html.erb_spec.rb create mode 100644 spec/views/origami/product_commissions/show.html.erb_spec.rb diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fdfb3e9b..de9b54ce 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,20 +2,11 @@ - - - - - - - - - - - - - + + + + @@ -32,101 +23,74 @@ - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -136,11 +100,12 @@ - origami table_invoice sale_id oqs void + red + origami @@ -154,7 +119,6 @@ @@ -330,59 +298,7 @@ @@ -800,6 +717,9 @@ + + + @@ -812,12 +732,12 @@ - + - @@ -828,19 +748,19 @@ + + - - @@ -854,8 +774,6 @@ - - @@ -863,9 +781,7 @@ - - @@ -887,9 +803,6 @@ - - - @@ -992,14 +905,6 @@ - - - - - - - - @@ -1059,7 +964,7 @@ - + @@ -1082,8 +987,75 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/controllers/origami/product_commissions_controller.rb b/app/controllers/origami/product_commissions_controller.rb new file mode 100644 index 00000000..f3f05ab9 --- /dev/null +++ b/app/controllers/origami/product_commissions_controller.rb @@ -0,0 +1,74 @@ +class Origami::ProductCommissionsController < ApplicationController + before_action :set_product_commission, only: [:show, :edit, :update, :destroy] + + # GET /product_commissions + # GET /product_commissions.json + def index + @product_commissions = ProductCommission.all + end + + # GET /product_commissions/1 + # GET /product_commissions/1.json + def show + end + + # GET /product_commissions/new + def new + @product_commission = ProductCommission.new + end + + # GET /product_commissions/1/edit + def edit + end + + # POST /product_commissions + # POST /product_commissions.json + def create + @product_commission = ProductCommission.new(product_commission_params) + + respond_to do |format| + if @product_commission.save + format.html { redirect_to @product_commission, notice: 'Product commission was successfully created.' } + format.json { render :show, status: :created, location: @product_commission } + else + format.html { render :new } + format.json { render json: @product_commission.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /product_commissions/1 + # PATCH/PUT /product_commissions/1.json + def update + respond_to do |format| + if @product_commission.update(product_commission_params) + format.html { redirect_to @product_commission, notice: 'Product commission was successfully updated.' } + format.json { render :show, status: :ok, location: @product_commission } + else + format.html { render :edit } + format.json { render json: @product_commission.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /product_commissions/1 + # DELETE /product_commissions/1.json + def destroy + @product_commission.destroy + respond_to do |format| + format.html { redirect_to product_commissions_url, notice: 'Product commission was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_product_commission + @product_commission = ProductCommission.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def product_commission_params + params.fetch(:product_commission, {}) + end +end diff --git a/app/helpers/origami/product_commissions_helper.rb b/app/helpers/origami/product_commissions_helper.rb new file mode 100644 index 00000000..1d191b16 --- /dev/null +++ b/app/helpers/origami/product_commissions_helper.rb @@ -0,0 +1,2 @@ +module Origami::ProductCommissionsHelper +end diff --git a/app/models/product_commission.rb b/app/models/product_commission.rb new file mode 100644 index 00000000..70de81f8 --- /dev/null +++ b/app/models/product_commission.rb @@ -0,0 +1,2 @@ +class ProductCommission < ApplicationRecord +end diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 511cd500..025cfae9 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -30,7 +30,7 @@
- Origami + Cashier
@@ -66,8 +66,7 @@

- Administrator - + Administrator

@@ -105,7 +104,7 @@
  • OQS

    • -
  • Origami

    • +
  • Cashier

  • CRM
@@ -115,8 +114,7 @@

- Manager - + Manager

@@ -152,7 +150,7 @@
  • OQS

    • -
  • Origami

    • +
  • Cashier

  • CRM
@@ -162,8 +160,7 @@

- Supervisor - + Supervisor

@@ -185,14 +182,13 @@

- Cashier - + Cashier

    -
  • Orgami Panel except Edit and Void
    • +
  • Cashier Panel except Edit and Void
  • Sale and Order
  • and Queue in CRM
@@ -203,8 +199,7 @@

- Accountant - + Accountant

@@ -223,11 +218,11 @@
-
+

- <%= shop.name %> + <%= shop.name %>

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0e046691..2a1d9fd3 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -29,108 +29,113 @@ <% @employees.each do |employee| %> -
-
+
+

<%= employee.name %>

- (<%= employee.emp_id%>) + (<%= employee.emp_id %>)
- <%= employee.role %> + <%= employee.role %>
-
+
<% end %>
-
+

Role Features

- +
-
-
-

- Administrator -

-
-
-
-
    -
  • All Accept
    • -
-
+
+
+

+ Administrator + +

+
+
+
+
    +
  • All Accept
    • +
-
-
-

- Manager -

-
-
-
-
    -
  • All Accept except Membership and Payment Settings
    • -
-
+
+
+
+

+ Manager + +

+
+
+
+
    +
  • All Accept except Membership and Payment Settings
    • +
-
-
-

- Supervisor -

-
-
-
-
    -
  • Void
    • -
  • FOC
    • -
  • Edit
    • -
  • Credit
    • -
  • and Payment
    • -
-
+
+
+
+

+ Supervisor + +

+
+
+
+
    +
  • Void
    • +
  • FOC
    • +
  • Edit
    • +
  • Credit
    • +
  • and Payment
    • +
-
-
-

- Cashier -

-
-
-
-
    -
  • Orgami Panel except Edit and Void
    • -
  • Sale and Order
    • -
  • and Queue in CRM
    • -
-
+
+
+
+

+ Cashier + +

+
+
+
+
    +
  • Orgami Panel except Edit and Void
    • +
  • Sale and Order
    • +
  • and Queue in CRM
    • +
-
-
-

- Accountant -

-
-
-
-
    -
  • Daily Sale Report
    • -
  • Sale Item Report
    • -
  • Receipt No Report
    • -
  • ShiftSale Report
    • -
-
+
+
+
+

+ Accountant + +

+
+
+
+
    +
  • Daily Sale Report
    • +
  • Sale Item Report
    • +
  • Receipt No Report
    • +
  • ShiftSale Report
    • +
+
@@ -140,6 +145,7 @@ .panel-body { padding: 5px !important; } + /*.card-columns { column-count: 4; display: inline-block; @@ -148,6 +154,7 @@ float: right; } + @media (min-width: 34em) { .card-columns { -webkit-column-count: 2; @@ -181,25 +188,25 @@ } @@ -207,6 +214,6 @@ $(document).on('turbolinks:load', function() { - + diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 813d46b2..7b094582 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -61,7 +61,7 @@
  • - +
  • diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index c60e8917..a79c1ce1 100644 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1,585 +1,596 @@
    - -
    + +
    - + - + +
    + -
    -
    - <% @complete.each do |sale| %> -
    -
    - <%= sale.receipt_no %> - <%= sale.sale_status %> -
    -
    - <% end %> -
    -
    +
    +
    + <% @complete.each do |sale| %> +
    +
    + <%= sale.receipt_no %> + <%= sale.sale_status %> +
    +
    + <% end %> +
    +
    - -
    -
    - <% @tables.each do |table| %> - <% if table.status == 'occupied' %> + +
    +
    + <% @tables.each do |table| %> + <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> -
    -
    - <%= table.name %> - billed -
    -
    -
    - <% else %> -
    -
    - <%= table.name %> - new -
    -
    - <% end %> - <% else %> -
    -
    - <%= table.name %> -
    -
    - <% end %> - <% end %> -
    -
    - - -
    -
    - <% @rooms.each do |room| %> - <% if room.status == 'occupied' %> - -
    -
    - <%= room.name %> - <% if room.get_booking.nil? %> - billed + <% if table.get_booking.nil? %> +
    +
    + <%= table.name %> + billed +
    +
    +
    + <% else %> +
    +
    + <%= table.name %> + new +
    +
    + <% end %> <% else %> - new +
    +
    + <%= table.name %> +
    +
    <% end %> -
    -
    - <% else %> -
    -
    - <%= room.name %> -
    -
    - <% end %> - <% end %> -
    -
    + <% end %> +
    +
    - -
    -
    + +
    +
    + <% @rooms.each do |room| %> + <% if room.status == 'occupied' %> - <% @orders.each do |order| %> -
    -
    - <%= order.order_id %> -
    -
    - <% end %> -
    -
    -
    - -
    - +
    +
    + <%= room.name %> + <% if room.get_booking.nil? %> + billed + <% else %> + new + <% end %> +
    +
    + <% else %> +
    +
    + <%= room.name %> +
    +
    + <% end %> + <% end %> +
    +
    - + +
    +
    + + <% @orders.each do |order| %> +
    +
    + <%= order.order_id %> +
    +
    + <% end %> +
    +
    +
    + +
    + + +
    -
    -
    +
    +
    - <% if @status_order == 'order' && @status_sale != 'sale' %> -
    ORDER DETAILS | Table <%= @dining.name rescue "" %>
    - <% elsif @status_sale == 'sale' %> -
    INVOICE DETAILS | Table <%= @dining.name rescue "" %>
    - <% end %> -
    -
    -
    -
    -

    Receipt No: + <% if @status_order == 'order' && @status_sale != 'sale' %> +

    + ORDER DETAILS | Table <%= @dining.name rescue "" %>
    + <% elsif @status_sale == 'sale' %> +
    INVOICE DETAILS | Table <%= @dining.name rescue "" %>
    + <% end %> +
    +
    +
    +
    +

    Receipt No: <% if @status_sale == 'sale' %> <%= @sale_array[0].receipt_no rescue '' %> - + <% end %>

    -
    -
    +
    +
    -

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

    -
    -
    +

    Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-' %> +

    +
    +
    -
    -
    - <% if @status_sale == 'sale' %> - -

    Customer : <%= @sale_array[0].customer.name rescue '' %>

    - <%else%> - -

    Customer : <%= @customer.name rescue "" %>

    - <%end%> -
    -
    -
    - - - +
    +
    + <% if @status_sale == 'sale' %> + +

    Customer : <%= @sale_array[0].customer.name rescue '' %>

    + <% else %> + +

    Customer : <%= @customer.name rescue "" %>

    + <% end %> +
    +
    +
    +
    + + - - - - - - <% - count = 0 - sub_total = 0 - if @status_sale == "sale" - @sale_array[0].sale_items.each do |sale_item| + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale_array[0].sale_items.each do |sale_item| - sub_total = sub_total + sale_item.price - %> - - <% - # Can't check for discount - unless sale_item.price == 0 - count += 1 - %> - - - - - - - - <% - - end - end - end - - if @status_order == 'order' && @status_sale != 'sale' - unless @order_items.nil? - count = 0 - @order_items.each do |order_item | + sub_total = sub_total + sale_item.price + %> + + <% + # Can't check for discount + unless sale_item.price == 0 count += 1 - sub_total = sub_total + (order_item.price * order_item.qty) + %> + + + + + + - unless order_item.price == 0 %> - - - - - - - <% + <% - end - end - end - end - %> - -
    #ItemsQTY - Price -
    #ItemsQTY + + Price + +
    <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    -
    -
    - - - - - - - <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%> - - <%else%> - - <%end%> + end + end + end - - - <% if @status_sale == "sale" %> - - - - - - - - - - - - + if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? + count = 0 + @order_items.each do |order_item| + count += 1 + sub_total = sub_total + (order_item.price * order_item.qty) + + unless order_item.price == 0 %> + + + + + + + <% + + end + end + end + end + %> + +
    Sub Total:<%= sub_total %>
    Member Discount:Discount:(<%= @obj_sale.total_discount rescue 0%>)
    Tax:<%= @obj_sale.total_tax rescue 0%>
    Rounding Adj:<%= @obj_sale.rounding_adjustment rescue 0%>
    Grand Total:<%= @obj_sale.grand_total rescue 0%>
    <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    +
    +
    + + + + + + + <% if @obj_sale != nil && @obj_sale.discount_type == 'member_discount' %> + + <% else %> + <% end %> - -
    Sub Total:<%= sub_total %>
    Member Discount:Discount:
    -
    -
    - <% - if @status_sale == 'sale' - unless @order_items.nil? - %> - Pending New Order - + + + <% if @status_sale == "sale" %> + + + + + + + + + + + + + <% end %> + +
    (<%= @obj_sale.total_discount rescue 0 %>)
    Tax:<%= @obj_sale.total_tax rescue 0 %>
    Rounding Adj: + <%= @obj_sale.rounding_adjustment rescue 0 %>
    Grand Total:<%= @obj_sale.grand_total rescue 0 %> +
    +
    +
    + + <% + if @status_sale == 'sale' + unless @order_items.nil? + %> + Pending New Order + <% - count = 0 - @order_items.each do |order_item | - count += 1 + count = 0 + @order_items.each do |order_item| + count += 1 %> - - - - - + + + + + <% - end - %> -
    <%= count %> - <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    <%= count %> + <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    - - <% end %> - <% if @sale_array.size > 1 %> -

    - Pending Payment - <% end %> - <% @sale_array.each do |sale| - if @sale_array.size > 1 - unless sale.receipt_no == @sale_array[0].receipt_no - %> + end + %> + + + <% end %> + <% if @sale_array.size > 1 %> +

    + Pending Payment + <% end %> + <% @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> - +
    Receipt No - <%= sale.receipt_no %> + +
    - <% - end - end - end - end - %> -
    -
    + <% + end + end + end + end + %> +
    +
    • - -
    - + +
    + - - - <% if @dining.bookings.length >= 1 %> - - <% if @status_order == 'order' && @status_sale != 'sale' %> - - - - - - - - - <% else %> - - - - - - - - - <% end %> - + + + <% if @dining.bookings.length >= 1 %> + + <% if @status_order == 'order' && @status_sale != 'sale' %> + + + + + + + + + <% else %> + + + + + + + + + + <% end %> + - - <% end %> -
    + + <% end %> +
    diff --git a/app/views/origami/product_commissions/_form.html.erb b/app/views/origami/product_commissions/_form.html.erb new file mode 100644 index 00000000..8dc34795 --- /dev/null +++ b/app/views/origami/product_commissions/_form.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for(@product_commission) do |f| %> + <%= f.error_notification %> + +
    +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/origami/product_commissions/_product_commission.json.jbuilder b/app/views/origami/product_commissions/_product_commission.json.jbuilder new file mode 100644 index 00000000..62361604 --- /dev/null +++ b/app/views/origami/product_commissions/_product_commission.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! product_commission, :id, :created_at, :updated_at +json.url product_commission_url(product_commission, format: :json) diff --git a/app/views/origami/product_commissions/edit.html.erb b/app/views/origami/product_commissions/edit.html.erb new file mode 100644 index 00000000..021c55c0 --- /dev/null +++ b/app/views/origami/product_commissions/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Product Commission

    + +<%= render 'form', product_commission: @product_commission %> + +<%= link_to 'Show', @product_commission %> | +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/index.html.erb b/app/views/origami/product_commissions/index.html.erb new file mode 100644 index 00000000..d64dc18f --- /dev/null +++ b/app/views/origami/product_commissions/index.html.erb @@ -0,0 +1,25 @@ +

    <%= notice %>

    + +

    Product Commissions

    + + + + + + + + + + <% @product_commissions.each do |product_commission| %> + + + + + + <% end %> + +
    <%= link_to 'Show', product_commission %><%= link_to 'Edit', edit_product_commission_path(product_commission) %><%= link_to 'Destroy', product_commission, method: :delete, data: { confirm: 'Are you sure?' } %>
    + +
    + +<%= link_to 'New Product Commission', new_product_commission_path %> diff --git a/app/views/origami/product_commissions/index.json.jbuilder b/app/views/origami/product_commissions/index.json.jbuilder new file mode 100644 index 00000000..e79e1dff --- /dev/null +++ b/app/views/origami/product_commissions/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @product_commissions, partial: 'product_commissions/product_commission', as: :product_commission diff --git a/app/views/origami/product_commissions/new.html.erb b/app/views/origami/product_commissions/new.html.erb new file mode 100644 index 00000000..68a3f804 --- /dev/null +++ b/app/views/origami/product_commissions/new.html.erb @@ -0,0 +1,5 @@ +

    New Product Commission

    + +<%= render 'form', product_commission: @product_commission %> + +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/show.html.erb b/app/views/origami/product_commissions/show.html.erb new file mode 100644 index 00000000..054447a1 --- /dev/null +++ b/app/views/origami/product_commissions/show.html.erb @@ -0,0 +1,4 @@ +

    <%= notice %>

    + +<%= link_to 'Edit', edit_product_commission_path(@product_commission) %> | +<%= link_to 'Back', product_commissions_path %> diff --git a/app/views/origami/product_commissions/show.json.jbuilder b/app/views/origami/product_commissions/show.json.jbuilder new file mode 100644 index 00000000..634630c7 --- /dev/null +++ b/app/views/origami/product_commissions/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "product_commissions/product_commission", product_commission: @product_commission diff --git a/db/migrate/20170822034139_create_product_commissions.rb b/db/migrate/20170822034139_create_product_commissions.rb new file mode 100644 index 00000000..95f9442d --- /dev/null +++ b/db/migrate/20170822034139_create_product_commissions.rb @@ -0,0 +1,12 @@ +class CreateProductCommissions < ActiveRecord::Migration[5.1] + def change + create_table :product_commissions do |t| + t.string :product_code + t.integer :commission_id + t.integer :qty + t.string :sale_id + t.string :sale_item_id + t.timestamps + end + end +end diff --git a/spec/controllers/origami/product_commissions_controller_spec.rb b/spec/controllers/origami/product_commissions_controller_spec.rb new file mode 100644 index 00000000..dc69b3d2 --- /dev/null +++ b/spec/controllers/origami/product_commissions_controller_spec.rb @@ -0,0 +1,141 @@ +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. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Origami::ProductCommissionsController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # ProductCommission. As you add validations to ProductCommission, 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 + # Origami::ProductCommissionsController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :show, params: {id: product_commission.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + product_commission = ProductCommission.create! valid_attributes + get :edit, params: {id: product_commission.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new ProductCommission" do + expect { + post :create, params: {origami_product_commission: valid_attributes}, session: valid_session + }.to change(ProductCommission, :count).by(1) + end + + it "redirects to the created origami_product_commission" do + post :create, params: {origami_product_commission: valid_attributes}, session: valid_session + expect(response).to redirect_to(ProductCommission.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {origami_product_commission: invalid_attributes}, session: valid_session + expect(response).to be_success + 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 origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: new_attributes}, session: valid_session + product_commission.reload + skip("Add assertions for updated state") + end + + it "redirects to the origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: valid_attributes}, session: valid_session + expect(response).to redirect_to(product_commission) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + product_commission = ProductCommission.create! valid_attributes + put :update, params: {id: product_commission.to_param, origami_product_commission: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested origami_product_commission" do + product_commission = ProductCommission.create! valid_attributes + expect { + delete :destroy, params: {id: product_commission.to_param}, session: valid_session + }.to change(ProductCommission, :count).by(-1) + end + + it "redirects to the product_commissions list" do + product_commission = ProductCommission.create! valid_attributes + delete :destroy, params: {id: product_commission.to_param}, session: valid_session + expect(response).to redirect_to(product_commissions_url) + end + end + +end diff --git a/spec/helpers/origami/product_commissions_helper_spec.rb b/spec/helpers/origami/product_commissions_helper_spec.rb new file mode 100644 index 00000000..59a4bdfc --- /dev/null +++ b/spec/helpers/origami/product_commissions_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::ProductCommissionsHelper. For example: +# +# describe Origami::ProductCommissionsHelper 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::ProductCommissionsHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/product_commission_spec.rb b/spec/models/product_commission_spec.rb new file mode 100644 index 00000000..11393dd9 --- /dev/null +++ b/spec/models/product_commission_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ProductCommission, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/origami/origami_product_commissions_spec.rb b/spec/requests/origami/origami_product_commissions_spec.rb new file mode 100644 index 00000000..a4827434 --- /dev/null +++ b/spec/requests/origami/origami_product_commissions_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Origami::ProductCommissions", type: :request do + describe "GET /origami_product_commissions" do + it "works! (now write some real specs)" do + get origami_product_commissions_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/origami/product_commissions_routing_spec.rb b/spec/routing/origami/product_commissions_routing_spec.rb new file mode 100644 index 00000000..1f6fed66 --- /dev/null +++ b/spec/routing/origami/product_commissions_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Origami::ProductCommissionsController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/origami/product_commissions").to route_to("origami/product_commissions#index") + end + + it "routes to #new" do + expect(:get => "/origami/product_commissions/new").to route_to("origami/product_commissions#new") + end + + it "routes to #show" do + expect(:get => "/origami/product_commissions/1").to route_to("origami/product_commissions#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/origami/product_commissions/1/edit").to route_to("origami/product_commissions#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/origami/product_commissions").to route_to("origami/product_commissions#create") + end + + it "routes to #update via PUT" do + expect(:put => "/origami/product_commissions/1").to route_to("origami/product_commissions#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/origami/product_commissions/1").to route_to("origami/product_commissions#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/origami/product_commissions/1").to route_to("origami/product_commissions#destroy", :id => "1") + end + + end +end diff --git a/spec/views/origami/product_commissions/edit.html.erb_spec.rb b/spec/views/origami/product_commissions/edit.html.erb_spec.rb new file mode 100644 index 00000000..5a19033a --- /dev/null +++ b/spec/views/origami/product_commissions/edit.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/edit", type: :view do + before(:each) do + @origami_product_commission = assign(:origami_product_commission, ProductCommission.create!()) + end + + it "renders the edit origami_product_commission form" do + render + + assert_select "form[action=?][method=?]", origami_product_commission_path(@origami_product_commission), "post" do + end + end +end diff --git a/spec/views/origami/product_commissions/index.html.erb_spec.rb b/spec/views/origami/product_commissions/index.html.erb_spec.rb new file mode 100644 index 00000000..655db3a8 --- /dev/null +++ b/spec/views/origami/product_commissions/index.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/index", type: :view do + before(:each) do + assign(:product_commissions, [ + ProductCommission.create!(), + ProductCommission.create!() + ]) + end + + it "renders a list of origami/product_commissions" do + render + end +end diff --git a/spec/views/origami/product_commissions/new.html.erb_spec.rb b/spec/views/origami/product_commissions/new.html.erb_spec.rb new file mode 100644 index 00000000..37e78caa --- /dev/null +++ b/spec/views/origami/product_commissions/new.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/new", type: :view do + before(:each) do + assign(:origami_product_commission, ProductCommission.new()) + end + + it "renders new origami_product_commission form" do + render + + assert_select "form[action=?][method=?]", product_commissions_path, "post" do + end + end +end diff --git a/spec/views/origami/product_commissions/show.html.erb_spec.rb b/spec/views/origami/product_commissions/show.html.erb_spec.rb new file mode 100644 index 00000000..a74efa8a --- /dev/null +++ b/spec/views/origami/product_commissions/show.html.erb_spec.rb @@ -0,0 +1,11 @@ +require 'rails_helper' + +RSpec.describe "origami/product_commissions/show", type: :view do + before(:each) do + @origami_product_commission = assign(:origami_product_commission, ProductCommission.create!()) + end + + it "renders attributes in

    " do + render + end +end