piyush828-design
da5cef26db
upgraded pagy to latest version
2025-04-16 17:46:31 +05:30
Filipe
9f988f7a02
Merge pull request #13216 from drummer83/email_header
...
Email header: Improve logo, resizing and styles
2025-04-09 12:00:09 +01:00
Filipe
c17821687d
Merge pull request #13243 from cyrillefr/GoButtonResumeEnabledAfterFailedReport
...
Fixes button staying disabled after report fail
2025-04-09 10:19:06 +01:00
Filipe
c3cb51441f
Merge pull request #13192 from dacook/display-customer-contacts-in-reports-13129
...
[FF] Add option to display customer contact details to suppliers in reports
2025-04-08 20:34:44 +01:00
cyrillefr
0ef3b06cdf
Requested changes
2025-04-07 13:12:51 +02:00
cyrillefr
019c703b1c
Fix Rubocop InverseOf offense in Order
...
- also fix failing spec due to adding inverse
2025-04-03 12:39:06 +02:00
cyrillefr
6666896fa3
Requested changes
2025-04-02 14:46:22 +02:00
Konrad
9ee37ee0b6
Update specs
2025-04-01 18:11:13 +02:00
cyrillefr
f0a5c76b45
Fixes button staying disabled after report fail
...
- added a test
2025-04-01 17:25:53 +02:00
Filipe
a7c77dc894
Merge pull request #13084 from abdulazizali77/bugfix/11529-report-by-enterprise-fee-from-lineitems
...
Fetch variant enterprise fees from order lineitems adjustments #11529
2025-04-01 16:13:51 +01:00
Trésor Bireke
5e7f0f8a1a
Merge branch 'master' into tb-rescue-not-found-error-for-enterprise
2025-04-01 01:10:17 +02:00
Gaetan Craig-Riou
0537a56b47
Merge pull request #13239 from cyrillefr/FixRailsRubocopIssueInverseOfInPayments
...
Fixes rubocop offense inverse_of on payment model
2025-04-01 09:59:01 +11:00
David Cook
d8eab7875f
Merge pull request #13235 from mkllnk/stock-aggregation
...
[API change] Remove unused ProductStock concern
2025-04-01 09:45:24 +11:00
David Cook
176e33d6bf
Rubocop fixes
2025-04-01 09:29:27 +11:00
Tresor11
507705a4eb
Update method name to require
...
This commit updates the method name to be called required_enterprise
since we only expect it to raise an error when the enterprise is not found.
2025-03-31 22:28:38 +03:00
cyrillefr
09a6da0c57
Fixes rubocop offense inverse_of on payment model
...
- some clean up unused method too
2025-03-31 17:10:43 +02:00
David Cook
e02ef08b06
Consolidate translations for hidden field
...
The string '< Hidden >' was agreed on as a good default, so we will use the hidden_field key.
I also moved the definition in en.yml up to the more general area at the start of admin.reports section (before it was hidden between report-specific keys.
2025-03-31 16:24:07 +11:00
David Cook
19b6cbcc9b
Packing reports: Display phone numbers to suppliers
2025-03-31 16:16:27 +11:00
David Cook
f40a00dde3
Expand spec to cover existing behaviour
...
And use let to avoid extra db query
2025-03-31 16:16:27 +11:00
David Cook
47b6888fe6
Display customer emails & phone numbers to suppliers
...
when permitted.
The MaskDataService is used by the report framework, so this should affect all reports. It would be nice to test all reports, but I figured it wasn't worth it (already we only test one report for masking names).
2025-03-31 16:16:27 +11:00
David Cook
b05a42f3bb
Refactor spec
2025-03-31 16:16:27 +11:00
David Cook
4402854a2a
AddEnableProducersToEditOrdersToEnterprises
...
With system spec for setting the preference. The enterprise edit page seems under-tested..
2025-03-31 16:16:27 +11:00
Gaetan Craig-Riou
421b753e0a
Merge pull request #13231 from chitty/more-rubocop-style-corrections
...
Correct rubocop Style/* offenses
2025-03-31 10:49:20 +11:00
Gaetan Craig-Riou
aee80ddf1d
Merge pull request #13230 from filipefurtad0/specs_mailer_reply_to_changes
...
Adds tests to recent reply_to email changes
2025-03-31 10:38:59 +11:00
Maikel Linke
b3ddfde1c3
Remove empty ProductStock concern
2025-03-28 14:49:47 +11:00
Maikel Linke
a48a1e1171
DRY importer spec
2025-03-28 14:48:40 +11:00
Maikel Linke
ca9f32ceae
[API change] Remove unused Product#on_hand
2025-03-28 14:48:40 +11:00
Maikel Linke
d55d4dd8ed
Remove unused Product#on_demand
2025-03-28 14:00:40 +11:00
Maikel Linke
8a8602158b
Test link in HTML email with Capybara
2025-03-27 12:06:05 +11:00
Maikel Linke
b554248cfe
Test for email content
2025-03-27 11:48:41 +11:00
Maikel Linke
1b8ebc3105
Test with known text
2025-03-27 11:38:35 +11:00
Maikel Linke
edcb04ed50
Save time by not storing test data in DB
2025-03-27 11:31:16 +11:00
Maikel Linke
e12c51edd1
Use RSpec matchers for emails
2025-03-27 11:29:15 +11:00
Carlos Chitty
58a16d89a3
Correct Style/RedundantInitialize rubocop offense
2025-03-26 11:16:24 -04:00
Carlos Chitty
9c8e0899d1
Correct Style/CaseEquality rubocop offense
2025-03-26 11:16:20 -04:00
filipefurtad0
e017b14f31
Adds spec for payment authorization emails
2025-03-26 12:19:02 +00:00
filipefurtad0
df3cbe84b6
Asserts that the order shipment and pick up emails have the distributors email as reply to address
2025-03-26 12:19:02 +00:00
filipefurtad0
98cba128e0
Asserts that the invoice email has the distributors email as reply to address
2025-03-26 12:18:55 +00:00
filipefurtad0
ea82b162ac
Asserts that the order cancellation email for customer has the distributors email as reply to address
2025-03-26 12:00:48 +00:00
filipefurtad0
9a161cae5b
Asserts that the order confirmation email for shops has the customer's email as reply to address
2025-03-26 12:00:48 +00:00
filipefurtad0
6ee1c8ca29
Asserts that the order cancellation email for shops has the customer's email as reply to address
2025-03-26 12:00:41 +00:00
filipefurtad0
c95c598f82
Asserts that the enterprise welcome email has no reply to address
...
Asserts that manager invitation email has the inviting enterprise as reply to address
2025-03-26 11:57:59 +00:00
Gaetan Craig-Riou
d8f2bb09d0
Re enable assertion
...
It's working fine with the current design
2025-03-26 12:50:42 +11:00
Gaetan Craig-Riou
1ee3e9a2a1
Add proper fee testing
...
The previous version wasn't testing anything as there was no fees set
up.
Now we check that fees are applied as expected, and also that supplier
fees are applied only to the expected product.
2025-03-26 12:50:35 +11:00
Carlos Chitty
ba693e3ecf
Autocorrect rubocop offense Style/RedundantAssignment
2025-03-25 13:33:50 -04:00
Maikel Linke
177a910aac
Disable printing expected error
2025-03-25 10:38:35 +11:00
Maikel Linke
973d1be90b
Style EmptyBlock
2025-03-25 10:38:35 +11:00
Maikel Linke
7abaaed5b6
Make test fail when we are not locking
2025-03-25 10:38:35 +11:00
Maikel Linke
dcedffac2f
Ensure we wait for all threads in spec
2025-03-25 10:38:34 +11:00
David Cook
ff7c23c8f9
Rename OrderCycleOpenedJob
...
This name better reflects what it's doing.
As this job is scheduled automatically by Sidekiq, I think there shouldn't be any jobs with the old name in redis. So I didn't bother keeping a placholder for the old name.
And Clean up unused include
2025-03-25 10:38:34 +11:00
