Skip to content

Commit 4d5370c

Browse files
author
Shruti Apte
committed
Merge branch 'release/1.9.0'
v1.9.0
2 parents a0f05c1 + f505de8 commit 4d5370c

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

.github/workflows/validations.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
postgresql password: "password"
2424
- name: Setup ElasticSearch
2525
uses: ankane/setup-elasticsearch@v1
26+
with:
27+
elasticsearch-version: 7.13.3
2628
- name: Setup chrome
2729
uses: nanasess/setup-chromedriver@v2
2830
with:

Gemfile.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ GEM
134134
babel-transpiler (0.7.0)
135135
babel-source (>= 4.0, < 6)
136136
execjs (~> 2.0)
137-
base64 (0.2.0)
137+
base64 (0.3.0)
138138
bcrypt (3.1.18)
139139
benchmark (0.4.0)
140140
better_html (2.0.1)
@@ -351,7 +351,7 @@ GEM
351351
memoist (0.16.2)
352352
mini_magick (4.12.0)
353353
mini_mime (1.1.5)
354-
mini_portile2 (2.8.8)
354+
mini_portile2 (2.8.9)
355355
minitest (5.25.4)
356356
mission_control-jobs (0.2.1)
357357
importmap-rails
@@ -365,7 +365,7 @@ GEM
365365
multi_xml (0.6.0)
366366
multipart-post (2.3.0)
367367
mutex_m (0.3.0)
368-
net-imap (0.5.6)
368+
net-imap (0.5.8)
369369
date
370370
net-protocol
371371
net-pop (0.1.2)
@@ -376,14 +376,14 @@ GEM
376376
net-protocol
377377
newrelic_rpm (9.8.0)
378378
nio4r (2.7.3)
379-
nokogiri (1.18.7)
379+
nokogiri (1.18.8)
380380
mini_portile2 (~> 2.8.2)
381381
racc (~> 1.4)
382-
nokogiri (1.18.7-arm64-darwin)
382+
nokogiri (1.18.8-arm64-darwin)
383383
racc (~> 1.4)
384-
nokogiri (1.18.7-x86_64-darwin)
384+
nokogiri (1.18.8-x86_64-darwin)
385385
racc (~> 1.4)
386-
nokogiri (1.18.7-x86_64-linux-gnu)
386+
nokogiri (1.18.8-x86_64-linux-gnu)
387387
racc (~> 1.4)
388388
oauth2 (2.0.9)
389389
faraday (>= 0.17.3, < 3.0)
@@ -431,7 +431,7 @@ GEM
431431
activesupport (>= 3.0.0)
432432
raabro (1.4.0)
433433
racc (1.8.1)
434-
rack (3.1.12)
434+
rack (3.1.16)
435435
rack-cors (2.0.0)
436436
rack (>= 2.0.0)
437437
rack-mini-profiler (3.0.0)
@@ -440,7 +440,7 @@ GEM
440440
rack
441441
rack-proxy (0.7.6)
442442
rack
443-
rack-session (2.1.0)
443+
rack-session (2.1.1)
444444
base64 (>= 0.1.0)
445445
rack (>= 3.0.0)
446446
rack-test (2.2.0)

app/services/invoice_payment/pdf_generation.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ def initialize(invoice, company_logo, root_url, filepath = nil)
66
@invoice = invoice
77
@invoice_line_items = @invoice.invoice_line_items
88
@company_logo = company_logo || ""
9-
@base_currency = invoice.company.base_currency
9+
# Updated to use the invoice currency instead of the company currency
10+
@base_currency = invoice.currency
1011
@root_url = root_url
1112
@filepath = filepath
1213
end

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@saeloun/miru-web",
3-
"version": "1.6.7",
3+
"version": "1.9.0",
44
"dependencies": {
55
"@babel/core": "^7.21.3",
66
"@babel/plugin-proposal-private-methods": "^7.16.5",

0 commit comments

Comments
 (0)