diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 77dbb850..518265d3 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -45,3 +45,5 @@ function export_to(path) var form_params = $("#frm_report").serialize(); window.location = path+"?"+ form_params; } + + diff --git a/app/assets/javascripts/popper.min.js b/app/assets/javascripts/popper.min.js new file mode 100644 index 00000000..95e9ef5a --- /dev/null +++ b/app/assets/javascripts/popper.min.js @@ -0,0 +1,5 @@ +/* + Copyright (C) Federico Zivolo 2017 + Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT). + */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=window.getComputedStyle(e,null);return t?o[t]:o}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e||-1!==['HTML','BODY','#document'].indexOf(e.nodeName))return window.document.body;var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll)/.test(r+s+p)?e:n(o(e))}function r(e){var o=e&&e.offsetParent,i=o&&o.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TD','TABLE'].indexOf(o.nodeName)&&'static'===t(o,'position')?r(o):o:window.document.documentElement}function p(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||r(e.firstElementChild)===e)}function s(e){return null===e.parentNode?e:s(e.parentNode)}function d(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return window.document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,i=o?e:t,n=o?t:e,a=document.createRange();a.setStart(i,0),a.setEnd(n,0);var f=a.commonAncestorContainer;if(e!==f&&t!==f||i.contains(n))return p(f)?f:r(f);var l=s(e);return l.host?d(l.host,t):d(e,s(t).host)}function a(e){var t=1=o.clientWidth&&i>=o.clientHeight}),f=0i[e]&&!t.escapeWithReference&&(n=z(p[o],i[e]-('right'===e?p.width:p.height))),pe({},o,n)}};return n.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';p=se({},p,s[t](e))}),e.offsets.popper=p,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,i=t.reference,n=e.placement.split('-')[0],r=V,p=-1!==['top','bottom'].indexOf(n),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]r(i[s])&&(e.offsets.popper[d]=r(i[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){if(!F(e.instance.modifiers,'arrow','keepTogether'))return e;var o=t.element;if('string'==typeof o){if(o=e.instance.popper.querySelector(o),!o)return e;}else if(!e.instance.popper.contains(o))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var i=e.placement.split('-')[0],n=e.offsets,r=n.popper,p=n.reference,s=-1!==['left','right'].indexOf(i),d=s?'height':'width',a=s?'top':'left',f=s?'left':'top',l=s?'bottom':'right',m=O(o)[d];p[l]-mr[l]&&(e.offsets.popper[a]+=p[a]+m-r[l]);var h=p[a]+p[d]/2-m/2,g=h-c(e.offsets.popper)[a];return g=_(z(r[d]-m,g),0),e.arrowElement=o,e.offsets.arrow={},e.offsets.arrow[a]=Math.round(g),e.offsets.arrow[f]='',e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=w(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement),i=e.placement.split('-')[0],n=L(i),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case fe.FLIP:p=[i,n];break;case fe.CLOCKWISE:p=K(i);break;case fe.COUNTERCLOCKWISE:p=K(i,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(i!==s||p.length===d+1)return e;i=e.placement.split('-')[0],n=L(i);var a=e.offsets.popper,f=e.offsets.reference,l=V,m='left'===i&&l(a.right)>l(f.left)||'right'===i&&l(a.left)l(f.top)||'bottom'===i&&l(a.top)l(o.right),g=l(a.top)l(o.bottom),b='left'===i&&h||'right'===i&&c||'top'===i&&g||'bottom'===i&&u,y=-1!==['top','bottom'].indexOf(i),w=!!t.flipVariations&&(y&&'start'===r&&h||y&&'end'===r&&c||!y&&'start'===r&&g||!y&&'end'===r&&u);(m||b||w)&&(e.flipped=!0,(m||b)&&(i=p[d+1]),w&&(r=j(r)),e.placement=i+(r?'-'+r:''),e.offsets.popper=se({},e.offsets.popper,S(e.instance.popper,e.offsets.reference,e.placement)),e=N(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],i=e.offsets,n=i.popper,r=i.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return n[p?'left':'top']=r[t]-(s?n[p?'width':'height']:0),e.placement=L(t),e.offsets.popper=c(n),e}},hide:{order:800,enabled:!0,fn:function(e){if(!F(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=T(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottomo.right||t.top>o.bottom||t.rightli.header { + color: #4b646f; + background-color: #1a2226; + line-height: 35px !important; +} +.main-nav { + + /* background-color: #161926 !important;*/ +} +/*.main-nav a { + color: #fff !important; +} +*/ +.sidebar-nav li a { + display: block; + text-decoration: none; + color: #999999; +} + +.sidebar-nav li a:hover { + text-decoration: none; + color: #fff; + background: rgba(255, 255, 255, 0.2); +} + +.sidebar-nav li a:active, +.sidebar-nav li a:focus { + text-decoration: none; +} + +.sidebar-nav > .sidebar-brand { + height: 65px; + font-size: 18px; + line-height: 60px; +} + +.sidebar-nav > .sidebar-brand a { + color: #999999; +} + +.sidebar-nav > .sidebar-brand a:hover { + color: #fff; + background: none; +} + +@media(min-width:768px) { + #wrapper { + padding-left: 0; + } + #wrapper.toggled { + padding-left: 210px; + } + #sidebar-wrapper { + width: 0; + } + #wrapper.toggled #sidebar-wrapper { + width: 216px; + } + #page-content-wrapper { + padding: 0px; + position: relative; + } + #wrapper.toggled #page-content-wrapper { + position: relative; + margin-right: 0; + } +} + +.dropdown-item{ + padding: 0px 1.5rem !important; +} + +.sidebar-sub-menu { + position: relative !important; + width: 200px; + list-style: none; + font-size: 14px; + background-color: #161926; + padding: 0px !important; + margin: 0px !important; +} + +.sidebar-sub-item { + display: block; + width: 100%; + + /*clear: both;*/ + /*font-weight: normal;*/ + /*color: #292b2c; + text-align: inherit; + white-space: nowrap; + background: none; + border: 0;*/ +} +.fa{ + +} +.custom-fa-arrow{ + font-size: 20px !important; + font-weight: bold; + padding: 9px 20px; +} + + diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 0883cc92..7863008d 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,195 +1,192 @@ -
-
-

Role Features

- -
- <% if current_user.role == 'administrator' %> -
-
-

- Administrator -

-
-
-
-
    -
  • All Settings
    • -
      -
    • Zone
      • -
    • OQS
      • -
    • Menu
      • -
    • Cashier Terminal
      • -
    • Payment
      • -
    • Merbership
      • -
    • Print
      • -
    • Employees
      • -
    • Accounts
      • -
    -
-
    -
  • Transactions
    • -
      -
    • Order
      • -
    • Sale
      • -
    • Credit Note
      • -

    -
  • Reports
    • -
      -
    • Daily Sale
      • -
    • Sale Item
      • -
    • Receipt
      • -
    • Shift Sale
      • -
    • Credit Sale
      • -
    • Void Sale
      • -
    -
-
    -
  • OQS

    • -
  • Cashier

    • -
  • CRM
    • -
-
-
+ + +
+
+

Role Features

+ +
+ <% if current_user.role == 'administrator' %> +
+
+

+ Administrator +

- <% elsif current_user.role == 'manager' %> -
-
-

- Manager -

-
-
-
-
    -
  • All Settings
    • -
      -
    • Zone
      • -
    • OQS
      • -
    • Menu
      • -
    • Cashier Terminal
      • -
    • Print
      • -
    • Employees
      • -
    • Accounts
      • -
    -
-
    -
  • Transactions
    • -
      -
    • Order
      • -
    • Sale
      • -
    • Credit Note
      • -

    -
  • Reports
    • -
      -
    • Daily Sale
      • -
    • Sale Item
      • -
    • Receipt
      • -
    • Shift Sale
      • -
    • Credit Sale
      • -
    • Void Sale
      • -
    -
-
    -
  • OQS

    • -
  • Cashier

    • -
  • CRM
    • -
-
-
-
- <% elsif current_user.role == 'supervisour' %> -
-
-

- Supervisor -

-
-
-
-
    +
    +
    +
      +
    • All Settings
      • +
        +
      • Zone
      • OQS
        • -
          -
        • Void
          • -
        • FOC
          • -
        • Edit
          • -
        • Credit
          • -
        • Payment
          • -
        +
      • Menu
        • +
      • Cashier Terminal
        • +
      • Payment
        • +
      • Merbership
        • +
      • Print
        • +
      • Employees
        • +
      • Accounts
      -
    -
    -
- <% elsif current_user.role == 'cashier' %> -
-
-

- Cashier -

-
-
-
+ +
    +
  • Transactions
      • -
    • Cashier Panel except Edit and Void
      • -
    • Sale and Order
      • -
    • and Queue in CRM
      • -
    -
-
-
- <% elsif current_user.role == 'account' %> -
-
-

- Accountant -

-
-
-
+
  • Order
    • +
  • Sale
    • +
  • Credit Note
    • +
    +
  • Reports
      • -
    • Daily Sale Report
      • -
    • Sale Item Report
      • -
    • Receipt No Report
      • -
    • ShiftSale Report
      • +
    • Daily Sale
      • +
    • Sale Item
      • +
    • Receipt
      • +
    • Shift Sale
      • +
    • Credit Sale
      • +
    • Void Sale
    -
    + +
      +
    • OQS

      • +
    • Cashier

      • +
    • CRM
      • +
    - <% end %> -
    -
    - -
    -
    -
    OQS
    -
    - -
    -
    Cashier
    -
    - -
    -
    CRM
    -
    - - - -
    -
    Inventory
    -
    -
    -
    -
    -
    -
    -

    - <%= @shop.name %> -

    +
    +
    +
    OQS
    +
    + +
    +
    Cashier
    +
    + +
    +
    CRM
    +
    + +
    +
    Inventory
    +
    +
    + + +
    + +
    +
    +
    +

    + <%= @shop.name %> +

    <%= @shop.address %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 328437ca..ea3ffc5e 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,10 +1,14 @@ +
    diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 6e3e6a58..7cc0112c 100644 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -5,22 +5,22 @@
    -
    + <%= render :partial=>'shift_sale_report_filter', :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %>
    -
    + -
    -
    -
    + + +
    Export to Excel
    -
    -
    + + -
    -
    +
    +
    <% unless @sale_data.blank? %> diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index d49d2660..0208090f 100644 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -1,144 +1,122 @@ -
    -
    - <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> - <% if period_type != false %> -
    -
    - - -
    - - -
    - - - -
    -
    - - -
    -
    - -
    -
    - <% end %> - - - -
    -
    - <% if defined? promotions %> - <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> - <% end %> - - <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> - <% end %> - - <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> - <% end %> - - <% if defined? shift_name %> - - <% end %> - <% if defined? cashiers %> - <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> - <% end %> - - <% if defined? singer %> - <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> - <% end %> - - <% if defined? bsm %> - <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - - <% if defined? guest_role %> - <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> - <% end %> - - <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> - <% end %> +<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    + - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> - <% end %> -
    -
    +
    + + + +
    +
    + + +
    +
    + +
    +
    + <% end %> - - +
    +
    + <% if defined? promotions %> + <%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %> + <% end %> + + <% if defined? menu_types %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <% end %> + + <% if defined? payments %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <% end %> + + <% if defined? shift_name %> + + <% end %> + + <% if defined? cashiers %> + <%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %> + <% end %> + + <% if defined? singer %> + <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> + <% end %> + + <% if defined? bsm %> + <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> <% end %> -
    -
    + + <% if defined? guest_role %> + <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> + <% end %> + + <% if defined? list_by_payment_type %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> + <% end %> + + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% end %> +
    +
    + +<% end %> diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 5868d078..e847316e 100644 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -1,121 +1,125 @@ -
    -
      -
    • Home
      • -
    • Receipt List Report
      • -
    -
    +
    +
    +
    +
      +
    • Home
      • +
    • Receipt List Report
      • +
    +
    -
    - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %> -
    -
    + + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %> +
    + -
    -
    -
    - Export to Excel -
    -
    -
    + + +
    + Export to Excel +
    + + -
    -
    -
    - - - - - - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> +
    +
    +
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    + - - - - - - <% @sale_taxes.each do |tax| %> - - <% end %> - - - - - - - - <% grand_total = 0 %> - <% old_grand_total = 0 %> - <% total_tax = 0 %> - <% guest_count = 0 %> - <% total_sum = 0 %> - <% discount_amt = 0 %> - <% other_amt = 0 %> - <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <%if @sale_data %> - <% @sale_data.each do |result| %> + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - - - - - <% result.sale_taxes.each do |tax| %> + + + + + + <% @sale_taxes.each do |tax| %> + + <% end %> + + + + + + + + <% grand_total = 0 %> + <% old_grand_total = 0 %> + <% total_tax = 0 %> + <% guest_count = 0 %> + <% total_sum = 0 %> + <% discount_amt = 0 %> + <% other_amt = 0 %> + <% total_nett = 0 %> + <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> + <%if @sale_data %> + <% @sale_data.each do |result| %> + + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + + + + + <% result.sale_taxes.each do |tax| %> - <%end%> - - - - - + <%end%> - <% end %> - - - - - <% @sale_taxes.each do |tax| %> + + + + + + <% end %> + + + + + <% @sale_taxes.each do |tax| %> - <% end %> - - - - - - - - - <% @sale_taxes.each do |tax| %> + <% end %> + + + + + + + + + <% @sale_taxes.each do |tax| %> - <% end %> - - - - - <%end%> - -
    Recipt NoCashier NameTotal AmountDiscount Amount <%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
    - Rounding Adj. -
    From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    Shift Name = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %>
    Recipt NoCashier NameTotal AmountDiscount Amount <%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
    + Rounding Adj. +
    <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %><%= tax.tax_payable_amount rescue '-' %><%= result.old_grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
     <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= result.old_grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
     <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= tax.st_amount.round(2) %><%= old_grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
     Total AmountDiscount Amount<%= old_grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= old_grand_total.to_f.round + rounding_adj %>
     Total AmountDiscount Amount<%= tax.tax_name %>Grand TotalRounding Adj.Grand Total +
    - Rounding Adj. -
    -
    + <% end %> + Grand Total + Rounding Adj. + Grand Total +
    + Rounding Adj. + + + <%end%> + + +
    +
    +
    \ No newline at end of file diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb index 1ccf99ad..5e5ae1bb 100644 --- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb @@ -1,87 +1,85 @@ -
    -
    - <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> - <% if period_type != false %> -
    -
    - - -
    - -
    - - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - <% end %> - - <% end %> -
    -
    + +<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    + +
    + + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + <% end %> + +<% end %> + \ No newline at end of file + }); + \ No newline at end of file diff --git a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb index 5313e61d..3c03a537 100644 --- a/app/views/reports/void_sale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/void_sale/_shift_sale_report_filter.html.erb @@ -1,125 +1,120 @@ -
    -
    - <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> - <% if period_type != false %> -
    -
    - - -
    - -
    - - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - <% end %> - - <% end %> -
    -
    +<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    + +
    + + + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + <% end %> +<% end %> diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index 53f8ff46..5f2557cc 100644 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -1,99 +1,97 @@ -
    -
      -
    • Home
      • -
    • Void Sale Report
      • -
    -
    +
    +
    +
    +
      +
    • Home
      • +
    • Void Sale Report
      • +
    +
    -
    - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> -
    -
    + + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> +
    + -
    -
    + +
    Export to Excel
    -
    -
    + + -
    -
    - <% if @sale_data.count > 0 %> - - - <% if !params[:from].blank?%> - - - - <% end %> - <% if @shift_from %> - - <% if @shift %> - <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - - - - - - <% total_amount = 0.0 %> - <% grand_total = 0.0 %> - <% rounding_adjustment = 0.0 %> - <% grand_rounding_adjustment = 0.0 %> - <% @sale_data.each do |result| %> - <% result[:items].each do |item| %> - - - - - - - - - - - <% total_amount = total_amount.to_f + item.total_amount.to_f %> - <% grand_total = grand_total.to_f + item.grand_total.to_f %> - <% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %> - <% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %> - <% end %> - <% end %> - - - - - - - - -
    From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
    Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
    Receipt NoSale DateTotal AmountGrand TotalRounding Adj.Grand Total +
    Rounding Adj.
    <%= item.receipt_no rescue '-' %> <%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %><%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %><%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%>
    Total Void Amount :<%= total_amount rescue '-' %><%= grand_total rescue '-' %><%= rounding_adjustment rescue '-'%><%= grand_rounding_adjustment rescue '-'%>
    -<% end %> -
    -
    +
    +
    + <% if @sale_data.count > 0 %> + + + <% if !params[:from].blank?%> + + + + <% end %> + <% if @shift_from %> + + <% if @shift %> + <% cashier_name = !@shift.nil? ? @shift[0].employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + + + + + + <% total_amount = 0.0 %> + <% grand_total = 0.0 %> + <% rounding_adjustment = 0.0 %> + <% grand_rounding_adjustment = 0.0 %> + <% @sale_data.each do |result| %> + <% result[:items].each do |item| %> + + + + + + + + + + + <% total_amount = total_amount.to_f + item.total_amount.to_f %> + <% grand_total = grand_total.to_f + item.grand_total.to_f %> + <% rounding_adjustment = rounding_adjustment.to_f + item.rounding_adjustment.to_f %> + <% grand_rounding_adjustment = grand_rounding_adjustment.to_f + item.grand_total.to_f + item.rounding_adjustment.to_f %> + <% end %> + <% end %> + + + + + + + + +
    From Date : <%= params[:from] rescue '-'%> , To Date : <%= params[:to] rescue '-'%>
    Shift Name = <%= @shift_from rescue '-'%> - <%= @shift_to rescue '-'%> ( <%= cashier_name rescue '-'%> )
    Receipt NoSale DateTotal AmountGrand TotalRounding Adj.Grand Total +
    Rounding Adj.
    <%= item.receipt_no rescue '-' %> <%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %><%= item.total_amount.to_f rescue '-'%> <%= item.grand_total.to_f rescue '-'%> <%= item.rounding_adjustment.to_f rescue '-' %><%= item.grand_total.to_f + item.rounding_adjustment.to_f rescue '-'%>
    Total Void Amount :<%= total_amount rescue '-' %><%= grand_total rescue '-' %><%= rounding_adjustment rescue '-'%><%= grand_rounding_adjustment rescue '-'%>
    + <% end %> +
    +