git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Nweni
2017-06-14 18:56:11 +06:30
parent 15c19e0cbb
commit 109d1b6435
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/forms/shop_form.rb
View File

@@ -1,7 +1,7 @@
#Form object to use during the installation process - will handle creation of shop model into db after verification from the cloud
#provising service through license verification
class ShopForm < ActiveModel
:attr_accessor :logo, :name, :address, :township, :city, :state, :country, :license, :base_currency, :password, :password_confirmation
end
# class ShopForm < ActiveModel
# # attr_accessor :logo, :name, :address, :township, :city, :state, :country, :license, :base_currency, :password, :password_confirmation
#
# end

2
app/pdf/receipt_bill_pdf.rb
View File

@@ -115,12 +115,10 @@ class ReceiptBillPdf < Prawn::Document
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
}
move_down 3
end

10
app/reports/menu_report.rb
View File

@@ -1,5 +1,5 @@
class MenuReport < Compendium::Report
query :list, collect: :active_record do |params|
Menu.all
end
end
# class MenuReport < Compendium::Report
# query :list, collect: :active_record do |params|
# Menu.all
# end
# end

12
app/views/kaminari/_paginator.html.erb
View File

@@ -10,14 +10,14 @@
<nav class="pagination">
<%= first_page_tag unless current_page.first? %>
<%= prev_page_tag unless current_page.first? %>
<% each_page do |page| -%>
<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
<% each_page do |page| %>
<% if page.left_outer? || page.right_outer? || page.inside_window? %>
<%= page_tag page %>
<% elsif !page.was_truncated? -%>
<% elsif !page.was_truncated? %>
<%= gap_tag %>
<% end -%>
<% end -%>
<% end %>
<% end %>
<%= next_page_tag unless current_page.last? %>
<%= last_page_tag unless current_page.last? %>
</nav>
<% end -%>
<% end %>