Maikel
4705d306b5
Merge pull request #9730 from AthiraKadampatta/9726-unused-paperclip-columns-ignored-list
...
Ignore paperclip columns to prepare for deletion
2022-10-11 11:44:42 +11:00
AthiraKadampatta
b2c778794d
9726 Remove safe navigation operator and simplify call to attachment file name
2022-10-10 16:52:02 +02:00
AthiraKadampatta
80eef9c302
9726 Add attachment_width and attachment_height to the list of ignored columns for spree images
2022-10-10 16:52:02 +02:00
AthiraKadampatta
f40b569a4a
9726 Use active storage filename instead of attachment_file_name of paperclip
2022-10-10 16:52:02 +02:00
AthiraKadampatta
1f161bee1f
Add paperclip columns to ignored columns list for enterprise, enterprise group, terms_of_service_file, spree/image models
2022-10-10 16:52:02 +02:00
Manish Sharma
cd71233163
Fixed duplicates enterprises in order cycles
2022-10-10 14:30:58 +05:30
Maikel
82e38d7b91
Merge pull request #9526 from jibees/6730-use-a-date-range-picker
...
Admin, List of Orders & Orders Bulk Management pages: use a date range picker
2022-10-10 13:59:37 +11:00
Maikel
5894246474
Merge pull request #9682 from binarygit/picked_up_email
...
Send picked up emails when orders are picked up
2022-10-10 13:15:24 +11:00
Maikel
058a45f4e5
Merge pull request #9442 from jibees/8904-display-fees-name-instead-of-type-on-invoices
...
Display fees name instead of type on invoices
2022-10-10 13:15:01 +11:00
Maikel
e5ccee42cc
Merge pull request #9725 from vsmay98/9468-hide-all-references-hub-from-producers-profile
...
[Shopfront] Hide hub with "hide all references" setup in producers profiles
2022-10-10 13:11:49 +11:00
Maikel
38f145549a
Merge pull request #9741 from mkllnk/empty-variant-param
...
Avoid error when sending empty variant attributes in bulk product edit
2022-10-10 11:43:10 +11:00
Jean-Baptiste Bellet
f5ebc797c4
Send change event on flatpickr widget close
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ea76615763
Forward focus event on calendar open
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
e076e23064
Do not use ng-change on endDate but instead watch both start and end date
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6ec3e7ee0c
Only send event change on valid range (ie. both start and end date)
...
+ do not refresh data on start date change but only on end date change
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ec4d091c2e
Remove the or label as it was unecessary
...
and actually, untranslated
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769
Implements daterangepicker for /admin/orders/bulk_management
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776
Implements daterangepicker for /admin/orders
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
19584ce6e0
flatpickr controller is now ready to be used in range mode
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
8942d3d17b
Clear date on custom event flatpickr_clear
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
ddfbcacd83
Include plugins
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
c3a7acf9ad
import locale
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
fb0d922d73
Remove datetimepicker directive + default values
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
5c83a3277e
Replace datetimepicker by flatpickr stimulus controller
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
c6332ab306
Remove datepicker instance
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6b7030a6a8
Don't use directive, but the flatpickr stimulusjs controller
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
b1fd6d9541
Create the flatpickr date|datetime controller
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
d73d6dcdb6
Do not import flatpickr via this require
...
as now flatpickr is managed by yarn and should be imported when module need it, via import
2022-10-08 16:36:26 +02:00
Maikel Linke
52e934ec2b
Consistently use our FeatureToggle module
...
Direct calls to Flipper have the downside that we can't add any new
functionality like storing the feature in the database when used.
2022-10-08 16:23:17 +02:00
binarygit
8335594351
Add different subject for picked up email
2022-10-08 12:31:26 +02:00
binarygit
44db511e66
Send a picked up email (rather than shipped email) when orders are picked up by customers
2022-10-08 12:31:26 +02:00
Jean-Baptiste Bellet
8b89c901ef
Do not display "Admin and Handling" ie. fees total
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4
Remove admin_and_handling merging
...
+ update specs as well
2022-10-08 10:00:57 +02:00
Maikel Linke
47ac118cf7
Simplify ProductSet by using Rails changes feature
...
I added a line to this class before and that made it too long. Now I
removed a line again to keep code quality up.
2022-10-08 09:03:38 +02:00
Maikel Linke
47a43163d8
Avoid error on empty variant attributes
...
In 2019 Pau observed an error where an empty attributes hash was passed
to the bulk product update method. He added an automated test but wasn't
able to reproduce the error.
A recent change in logic made the spec fail but rspec-retry hid that
fail because it would succeed on a second try (not sure why). I now
changed the logic to ignore empty attributes properly and avoid an error
trying to create a new variant when no attributes are given.
* f9403977816f228781d4
2022-10-08 09:03:38 +02:00
Vishal Jain
6ead127b5c
add not hidden scope to hide hidden hub from producers profile
2022-10-07 11:24:32 +02:00
Maikel
a43d31a9d5
Merge pull request #9711 from dacook/translation-cleanup
...
Translation cleanup
2022-10-06 09:51:28 +11:00
Rachel Arnould
611475c48a
Merge pull request #9448 from binarygit/cancel-orders-in-bulk
...
Cancel Orders in Bulk
2022-10-04 19:48:59 +02:00
David Cook
0fc8c719fe
Scope Enterprise side menu translations
...
And removed some now-unused global translations, yay! I searched for these in the codebase, eg with regex:
/\bt[\( ]["':]shop_preferences/
2022-10-04 19:39:29 +02:00
David Cook
4c3e20d25a
Scope Enterprise form legend translations
2022-10-04 19:39:29 +02:00
David Cook
13d95ecf1d
Scope Enterprise Group side menu translations
...
With it's own lazy scope, we no longer need to define labels separately.
2022-10-04 19:39:29 +02:00
David Cook
7803e5d4ff
Scope Enterprise Group form legend translations
...
Using lazy-lookup builtin scopes, instead of sharing the global translations, as per our guidelines.
2022-10-04 19:39:29 +02:00
David Cook
2e2ff25ef7
DRY up code
...
Slightly. If we upgrade to Ruby 3.1 with hash value omission, this would be neater.
If we could set a scope in the controller (https://stackoverflow.com/questions/6137960/rails-i18n-default-scope ) it would be even neater.
2022-10-04 19:39:29 +02:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
binarygit
930721bea6
Redirect to shop front when OC closes during checkout
2022-10-03 20:51:41 +02:00
jibees
0c64720a9e
Merge pull request #9710 from mkllnk/9002-customer-association-updates
...
Associate and update customer records when ordering
2022-09-30 16:36:01 +02:00
Filipe
4b279d28dd
Merge pull request #9262 from cillian/order-cycle-shipping-methods
...
Let people customise which shipping methods are available to customers on order cycles
2022-09-30 14:36:37 +01:00
Filipe
f7d21406a1
Merge pull request #9702 from ashwini-seshadri/master
...
Fix for new subscription dialog
2022-09-30 13:32:42 +01:00
Cillian O'Ruanaidh
def87485c0
Don't delete schedules on the order_cycles#update action just because the :schedule_ids was not specified in the parameters
...
Before this schedules were being deleted when the Checkout Options step of editing order cycles was saved because this step wasn't sending the :schedule_ids parameter. It's more awkard for API users if they always need to explicity send the :schedule_ids parameter even if they don't want to add/remove any of the schedules, for example if they just want to update an order cycle name.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
db92e9d91c
Fix error from OrderCycle#distributor_shipping methods return ActiveRecord::Relation sometimes and Array other times
...
Now it will return ActiveRecord::Relation consistently.
2022-09-30 13:13:39 +01:00
