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

fixed conflict gem

Browse Source
This commit is contained in:
Aung Myo
2017-06-04 16:42:18 +06:30
parent af02a63263
commit d058b1b1b8
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile
View File

@@ -9,19 +9,17 @@ end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.0' gem 'rails', '~> 5.1.0'
# Use mysql as the database for Active Record # Use mysql as the database for Active Record
<<<<<<< HEAD
#gem 'mysql2', '>= 0.3.18', '< 0.5' #gem 'mysql2', '>= 0.3.18', '< 0.5'
gem 'pg'
=======
gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'mysql2', '>= 0.3.18', '< 0.5'
#Use PosgreSQL #Use PosgreSQL
gem 'pg' #gem 'pg'
# redis server for cable # redis server for cable
# gem 'redis', '~> 3.0' # gem 'redis', '~> 3.0'
>>>>>>> a2c9996b765666db4cbcbef188fcfa2d27a7a6e2
# Use Puma as the app server # Use Puma as the app server
gem 'puma', '~> 3.0' gem 'puma', '~> 3.0'
# Use SCSS for stylesheets # Use SCSS for stylesheets

2
Gemfile.lock
View File

@@ -119,7 +119,6 @@ GEM
nokogiri (1.7.2) nokogiri (1.7.2)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
pdf-core (0.7.0) pdf-core (0.7.0)
pg (0.20.0)
prawn (2.2.2) prawn (2.2.2)
pdf-core (~> 0.7.0) pdf-core (~> 0.7.0)
ttfunk (~> 1.5) ttfunk (~> 1.5)
@@ -253,7 +252,6 @@ DEPENDENCIES
kaminari! kaminari!
listen (~> 3.0.5) listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5) mysql2 (>= 0.3.18, < 0.5)
pg
prawn prawn
prawn-table prawn-table
puma (~> 3.0) puma (~> 3.0)

2
app/pdf/receipt_bill_pdf.rb
View File

@@ -23,7 +23,7 @@ class ReceiptBillPdf < Prawn::Document
header( printer_settings.printer_name, printer_settings.name) header( printer_settings.printer_name, printer_settings.name)
stroke_horizontal_rule stroke_horizontal_rule
cashier_info(sale.receipt_no,sale.customer.name, sale.receipt_date) cashier_info(sale.receipt_no,sale.customer, sale.receipt_date)
line_items(sale_items) line_items(sale_items)
all_total(sale_data) all_total(sale_data)