Commit Graph

12609 Commits

Author SHA1 Message Date
Konrad
87b3b6fa36 Add files via upload 2021-11-18 00:23:05 +01:00
Matt-Yorkley
378d3d5ab6 Merge pull request #8476 from Matt-Yorkley/reports-producers-visibility
Ensure line items are correctly scoped for producers
2021-11-17 15:07:37 +00:00
Maikel
c5c09dbcf8 Merge pull request #8483 from Matt-Yorkley/guest-token
Remove dead code: session[:guest_token]
2021-11-17 17:07:00 +11:00
Matt-Yorkley
0efa370211 Merge pull request #8405 from jibees/7961-translate-stripe-error-message
Translate stripe error messages during payment processing
2021-11-16 11:49:12 +00:00
Matt-Yorkley
d0f572b051 Remove dead code: session[:guest_token]
This `session[:guest_token]` doesn't seem to ever be assigned anywhere in the codebase, and it doesn't seem to be read at any point either..? There are some various places where `current_order.token` is used and `session[:access_token]` is used, but not this.

As far as I can tell: it was part of an old version of Spree and related to the spree_auth_devise gem (which we no longer use).
2021-11-14 12:02:07 +00:00
Matt-Yorkley
0683941f88 Ensure line items are correctly scoped for producers 2021-11-11 13:11:19 +00:00
Jean-Baptiste Bellet
7041ec71a4 Translate some error messages during payment processing if exists
- Stripe error messages aren't translated. But, Stripe send the error code. Use it (if found it, and translation key does exist) to translated the error message
 - Populate the en.yml file with some of the most known errors

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
2021-11-11 12:04:38 +01:00
Jean-Baptiste Bellet
d2dbe6c738 Use distinct to return unique product
- Product were displayed twice (or more) in certain condition under order cycle incoming products admin interface
2021-11-10 14:49:19 +01:00
Matt-Yorkley
8cb2a2cc96 Merge pull request #8451 from Matt-Yorkley/variant-search-debounce
Fix debounce on variant search dropdown
2021-11-05 18:59:44 +00:00
Matt-Yorkley
47dbfa7d17 Merge pull request #8145 from Matt-Yorkley/reports-query-interface
Reports Query Interface
2021-11-05 10:06:52 +00:00
Maikel
a29330884c Merge pull request #8289 from jibees/7409-add-signup-matomo-event
Track event via matomo when submitting signup form
2021-11-05 11:05:45 +11:00
Maikel
3f571d178f Merge pull request #8418 from KombiCode/7706-add-close-button-to-flatpickr
7706 add close button to flatpickr
2021-11-05 11:04:50 +11:00
Matt-Yorkley
ce61b5088e Fix debounce on variant search dropdown
This wasn't applied correctly so there was zero debounce, leading to a big excess of pointless requests whilst typing in the variant search dropdown
2021-11-04 20:44:09 +00:00
Matt-Yorkley
ce047c4255 Ensure Suppliers multiselect options persist between page loads 2021-11-04 14:55:23 +00:00
Matt-Yorkley
439a2318fb Move API response under top-level :data node 2021-11-04 14:55:23 +00:00
Matt-Yorkley
924f6568d6 Replace data loading with new Reports::QueryInterface 2021-11-04 14:55:23 +00:00
Matt-Yorkley
817f0942dd Pull in reports POC work replacing Packing reports 2021-11-04 14:55:23 +00:00
Matt-Yorkley
d46ed59699 Remove preference from Enterprise class 2021-11-04 11:48:30 +00:00
Matt-Yorkley
cf5d964133 Update usages of old preference getters and setters 2021-11-04 11:48:30 +00:00
Maikel
1cef0dd2ac Merge pull request #8428 from Matt-Yorkley/enterprise-dead-code
Remove Enterprise #inheritance_column
2021-11-03 17:29:42 +11:00
Maikel
43514f61ea Merge pull request #8312 from mariodz95/8249_fix_snail_on_shipping_method_fees
Fix snail on shipping method fees
2021-10-29 12:04:25 +11:00
Maikel
e5c755e6ad Merge pull request #8395 from sinansonmez/7937-include-missing-navigation-for-super-admin-only
Missing navigation for super admin users only included
2021-10-29 12:03:48 +11:00
Maikel
03963c8feb Merge pull request #8415 from jibees/add-tax_category_id-to-adjustements
API: add the tax_category_id for each ajustements of an order
2021-10-29 12:02:59 +11:00
Maikel
1b79fdd333 Merge pull request #8409 from luisAzcuaga/task/rubocop
[6055] Task: Run rubocop over existing todo
2021-10-29 12:01:12 +11:00
Jean-Baptiste Bellet
fc8cd30cce Add the tax_category_id for each adjustement
- This tax_category_id could be null
 - Special case if the originator is a Spree::TaxRate: then use the tax_category_id of the originator

Co-Authored-By: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
2021-10-28 15:04:43 +02:00
Matt-Yorkley
d1a91a53ea Merge pull request #8365 from lamphanqg/fix_menu_indicator
Fix menu indicator on bulk order page
2021-10-28 13:59:32 +01:00
Matt-Yorkley
f0ec739350 Merge pull request #8366 from lamphanqg/fix_bulk_buy_layout
Fix broken layout of bulk buy
2021-10-28 12:35:36 +01:00
Matt-Yorkley
462ff15f76 Remove Enterprise #inheritance_column
Apparently this was part of an old feature from 2014...
2021-10-28 10:44:23 +01:00
Maikel
2e8f4c1538 Merge pull request #8367 from bellvat/bug-show-error
Add test and change order_cycle#show to redirect to edit page.
2021-10-28 16:36:47 +11:00
Thierry Jet
5ebee9cd5f Translation stuff ready for Close button. Add close: key scoped spree.admin.date_picker in en.yml 2021-10-26 19:38:49 +02:00
Thierry Jet
66f754267b Customize spacing for shortcut-buttons into flatpickr 2021-10-26 14:40:42 +02:00
Thierry Jet
47e9692226 Add a close button to datepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:36:16 +02:00
Thierry Jet
c45e120ff8 Add a close button to datetimepicker. Close the popover when clicked. Not yet using translation 2021-10-26 14:33:02 +02:00
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
PHAN QUANG LAM
77524c633d Fix menu indicator on bulk order page 2021-10-26 06:41:30 +09:00
Sinan Chaush
aedacb1311 Missing navigation for super admin users only included 2021-10-24 22:34:38 +02:00
GeorgeThoppil
2c596fb2dd Adding regex op on long_description 2021-10-23 14:45:49 -04:00
jibees
fa7c64841f Merge pull request #8286 from mkllnk/permalink-check
Avoid superfluous permalink check on site load
2021-10-22 09:14:41 +02:00
jibees
a5a45539c3 Merge pull request #8308 from mariodz95/8250_fix_snail_when_editing_non_numeric_characters_on_enterprise_fees
Fix snail when editing non numeric characters on enterprise fees
2021-10-22 09:14:28 +02:00
jibees
e123353252 Merge pull request #8325 from achauve/3976-improve-error-handling-of-unsupported-image-formats
Improve error handling of unsupported image formats
2021-10-22 09:13:19 +02:00
jibees
2e846ce1e0 Merge pull request #8347 from achauve/8227-fix-opening-product-description-links-in-new-tabs
Fix: product edition doesn't break description links
2021-10-22 09:13:02 +02:00
jibees
741966b569 Merge pull request #8375 from jibees/8358-add-tax-category-to-line-item
Add `tax_category_id` for a line_item
2021-10-21 15:00:29 +02:00
Maikel
c642b98067 Merge pull request #8193 from jibees/8155-split-checkout-mobile-views
Some responsive modifications for split checkout
2021-10-20 11:48:57 +11:00
Monica Sirathanarun
ebaf96ddae Add test and change order_cycle#show to redirect to edit page. 2021-10-19 23:20:54 +07:00
mariodz95
578efa945e Fix snail when editing enterprise fees 2021-10-19 10:26:44 +02:00
mariodz95
d1160ec66a Fix snail on shipping method fees 2021-10-19 09:56:35 +02:00
Maikel
a271a66998 Merge pull request #8271 from sinansonmez/8176-preselect-supplier-when-only-one
When creating a product, preselect the supplier if there is only one
2021-10-19 14:12:00 +11:00
Adrien Chauve
bd3bea8025 Fix: product edition doesn't break description links
-> otherwise product edition was breaking description links, which were
not opening in a new tab anymore.
2021-10-18 11:29:33 +02:00
Jean-Baptiste Bellet
115dac3ca9 Add tax_category_id for a line_item 2021-10-18 10:56:27 +02:00
Adrien Chauve
c818ec5508 Fix image creation button title and icon 2021-10-17 22:47:12 +02:00