Ahmed Ejaz
87c957541d
refactor: fix rubocop lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
213209b460
hide customer info on bulk orders page
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4e2198cd4f
hide shipping icons from suppliers
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
293b30cfa6
simplify block
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f2adcbf2b8
fix syntax error
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
acdffb0aa1
revert "remove subquery for optimization"
...
- we are using OR between two queries here: 53ec6621bc/app/services/search_orders.rb (L31-L32)
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0500294480
rename is_producer to is_producer_only
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
a4f1f542be
rename distributor_allows_order_editing to filter_by_supplier
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
adbdc64c13
remove subquery for optimization
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
f132d99df4
remove ids usage
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
ccfd0edbf1
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bf6934db94
add specs
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
bc3917ebc1
incorporate show_customer_names_to_suppliers setting
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
4bc578f38f
restrict page sections from supplier
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
3e71f8293c
add bulk_management ability
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
d9308799b0
add ability search supplier products in orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
19c5fec9a9
add ability update supplier line_items in orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
0a61910cf6
add ability to view supplier products containing orders
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
93fb3fd7d9
add enterprise producers_to_edit_orders setting
2025-04-13 21:35:55 +05:00
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
019c703b1c
Fix Rubocop InverseOf offense in Order
...
- also fix failing spec due to adding inverse
2025-04-03 12:39:06 +02:00
Konrad
d42d86b763
Reduce max-width of logo to reflect the proposed aspect ratio of 640px / 130px (= 247px / 50px)
2025-04-01 18:37:59 +02:00
Konrad
3b0b023624
Remove unused styles
...
Class "btn": not used in any of the emails and invoices
Class "column-wrap": not used in any of the emails and invoices
Class "collapse": margin and padding are set globally to zero already, padding is not used, but we need margin to overwrite it for h6
2025-04-01 18:36:25 +02:00
Konrad
db3a8a6b30
Header: Improve logo, resizing and styles
...
Use the site's main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)
The table's background color is defined in the parent table already
Limit the max width and max height of the logo and resize the logo accordingly instead of forcing it to squeeze into a fixed size
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
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
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
729dc9d658
Move mask logic to separate module
...
And cross-reference similar files so we don't miss it next time\!
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
98ab910fb4
Refactor
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
David Cook
02db30202b
Use rails form helper methods
...
This helps ensure the labels are attached to the radio buttons, so you can click on the words to select the option.
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
David Cook
91a9a3cd77
Merge pull request #13226 from cyrillefr/FixRailsInversOfPartI
...
Fixes some Rails InverseOf offenses
2025-03-31 09:48:51 +11:00
Filipe
37ef5d5b02
Merge pull request #13214 from chahmedejaz/task/13179-expand-notes-edit-order
...
Fix expand notes field when editing order
2025-03-28 16:43:29 +00:00
Maikel Linke
b3ddfde1c3
Remove empty ProductStock concern
2025-03-28 14:49:47 +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
cyrillefr
da26f5833f
Requested changes
2025-03-26 19:44:08 +01:00
Carlos Chitty
ecb303fef5
Correct Style/SlicingWithRange rubocop offenses
2025-03-26 11:16:24 -04:00
Carlos Chitty
7f734cf2f8
Autocorrect Style/PreferredHashMethods rubocop offense
2025-03-26 11:16:24 -04:00
cyrillefr
1d24674386
Fixes some Rails InverseOf offenses
2025-03-25 18:46:00 +01:00
Filipe
9fa42cae47
Merge pull request #13143 from mkllnk/admin-in-same-tab
...
Open admin dashboard in same tab by default
2025-03-25 17:10:51 +00:00
Filipe
2a3927caad
Merge pull request #13176 from drummer83/reply-to-email-address_part2
...
Add a 'reply to' email address to some more emails
2025-03-25 17:00:02 +00:00
