Ahmed Ejaz
d12455ccbe
update schema
2025-04-13 21:45:04 +05:00
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
eee5d5c8ad
fix buggy spec:
...
- this before block was causing multiple nevigation to the index
- one from the spec itself, one from here.
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
3474734418
implement spree_current_user let! so that user creation doesn't get captured in the scoper queries
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
9867d0bc3a
fix flaky spec error:
...
Ferrum::BrowserError:
Argument should belong to the same JavaScript world as target object
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
b803e18f42
fix lint issues
2025-04-13 21:35:55 +05:00
Ahmed Ejaz
20146a8e11
update respective 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
Ahmed Ejaz
408ccc5c16
Update all locales with the latest Transifex translations
2025-04-12 23:33:20 +05:00
David Cook
6e344de7e2
Merge pull request #13254 from dacook/fix-schema
...
Remove accidental line from schema
2025-04-11 12:12:56 +10:00
David Cook
f3cec40322
Remove accidental line from schema
...
This was accidentally included in merged PR #13192 but is due to be added in unmerged PR #13113
I rectified this in my dev env and regenerated schema to ensure it was correct (I didn't manually edit it).
2025-04-11 11:09:28 +10:00
filipefurtad0
6a49668307
Update all locales with the latest Transifex translations
2025-04-10 16:00:54 +01: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
0ef3b06cdf
Requested changes
2025-04-07 13:12:51 +02:00
David Cook
5dcdf0caed
Merge pull request #13247 from cyrillefr/FixRailsRubocopIssueInverseOfInOrder
...
Fix Rubocop InverseOf offense in Order model
2025-04-07 16:45:50 +10:00
David Cook
369b93f0dd
Update tip
...
By updating the translation key, all other locales will be notified to update their translations too.
2025-04-07 16:33:39 +10:00
Ahmed Ejaz
34e8bc83b9
Update all locales with the latest Transifex translations
2025-04-05 03:49:47 +05: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
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
9ee37ee0b6
Update specs
2025-04-01 18:11:13 +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
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
Filipe
bb527a2cbd
Merge pull request #13224 from Tresor11/tb-rescue-not-found-error-for-enterprise
...
Fix: Admin visiting non-existent enterprise raises error
2025-04-01 15:00:41 +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
bf3cfeb9fa
Merge pull request #13236 from mkllnk/deprecations
...
Alert us to deprecation warnings
2025-04-01 09:53:02 +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
