Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Matt-Yorkley
96138e9129
Refactor UserLocaleSetter public methods
2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877
Make #valid_locale_for_user an instance method
2020-07-04 09:51:00 +02:00
Matt-Yorkley
05c1f093b2
Delete dead code
...
There's nothing done in this bit of code that isn't already done somewhere else, and more effectively.
2020-07-03 16:44:37 +02:00
Matt-Yorkley
0c2fd4bfd2
Fix ensure_valid_locale_persisted and change public interface of service
2020-07-03 16:39:24 +02:00
Matt-Yorkley
ab63d2234c
Guard against nils in conditions
2020-07-03 14:22:32 +02:00
Matt-Yorkley
078726dcca
Add explanatory comment on saving selected locale in cookies
2020-07-03 14:21:45 +02:00
Matt-Yorkley
dab0add492
Make conditional more concise
2020-07-03 14:20:51 +02:00
Matt-Yorkley
ebffa381c6
Update cookies[:locale] logic
2020-07-03 14:06:05 +02:00
Matt-Yorkley
faa7c0a7c5
Extract save_cookies_from_locale comment-method
2020-07-03 14:03:52 +02:00
Matt-Yorkley
02549d1b0f
Extract all locale-setting logic to a service
2020-07-03 13:44:13 +02:00
Pau Pérez Fabregat
4ced16c206
Merge pull request #5709 from luisramos0/empty
...
Replace empty? with blank? and replace unless empty? with if present?
2020-07-02 11:36:37 +02:00
Luis Ramos
2d4326ded3
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
...
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Matt-Yorkley
87cd936c94
Blacklist timestamp attributes when assigning for update
...
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b
Use #dup when copying attributes hash
...
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
2020-06-30 11:30:16 +02:00
Luis Ramos
ed5fc29c44
Fix hash alignment issue
2020-06-22 17:39:20 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
5d710f1e24
Use ruboccop autocorrect to fix issues
2020-06-22 12:46:07 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Luis Ramos
208623bb0a
Merge pull request #5635 from Matt-Yorkley/map-icons
...
Ensure map icon URLs are correctly generated with fingerprints
2020-06-18 18:02:47 +01:00
Matt-Yorkley
130f639b61
Rename service and use #call
2020-06-18 17:14:50 +02:00
Matt-Yorkley
5338e782f8
Extract serializer helper method to service so the method isn't globally available
2020-06-18 16:44:15 +02:00
Luis Ramos
f6e3e01a10
Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller
...
Add spec to verify payment source attributes are passed
2020-06-18 09:54:34 +01:00
Pau Perez
ff4d7fbc45
Refactor with Arel to perform a single query
2020-06-16 14:01:27 +02:00
Pau Perez
00c9dd7ece
Remove N+1 fetching order and li adjustments
2020-06-16 14:01:27 +02:00
François Turbelin
b4952dcbfb
Cosmetics
2020-06-16 14:01:27 +02:00
François Turbelin
9abe41f6cb
Use OrderTaxAdjustmentsFetcher service
2020-06-16 14:01:27 +02:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat
06feae994d
Merge pull request #5353 from pacodelaluna/sort-invoices-in-bulk-invoice-with-forced-order
...
Sort invoices in bulk invoice with completed_at desc order
2020-06-11 15:34:39 +02:00
Luis Ramos
1e248c1848
Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method
...
Enhancement/5277 be able to filter orders according to shipping method
2020-06-10 20:50:06 +01:00
Maikel Linke
7d53b12baf
Preserve sorting by completion date
2020-06-10 10:19:15 +10:00
François Turbelin
6056c1699f
Use batches in order to fetch orders
2020-06-09 10:10:34 +02:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Matt-Yorkley
1e3bf7fec4
Merge pull request #5487 from coopdevs/fix-schedule-factory
...
[Spree 2.1] Allow to create order_cycle_schedules
2020-05-30 13:49:47 +02:00
Pau Perez
24e897d145
Do not build OC with schedules at the same time
...
It's not possible when neither the OC nor the schedule has an id due to
the new join table order_cycle_schedules.
2020-05-29 17:00:52 +02:00
Luis Ramos
4026e072d5
Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor
2020-05-26 11:13:16 +01:00
François Turbelin
b2b988b063
Apply new order directly inside service
2020-05-24 14:41:40 +02:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Matt-Yorkley
b00fbd69ae
Update Fragment Caching for Rails 4
...
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
2020-05-22 14:22:21 +02:00
Eduardo
6d54e6d4a0
change SearchOrders service to search with shipping_method
2020-05-18 20:44:55 -03:00
Luis Ramos
1c749a8029
Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles
2020-05-15 19:36:59 +01:00
Luis Ramos
a438317d69
Extract order_cart_reset service from enterprises_controller
2020-05-15 19:30:00 +01:00
Luis Ramos
35824c7aa1
Rename restartCheckout to order_checkout_restart to make it follow service naming convention
2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1
Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders
2020-05-15 19:29:37 +01:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Matt-Yorkley
6b6ab864ef
Improve comment on Fragment Caching
2020-05-07 13:20:30 +02:00
Matt-Yorkley
37821beb1b
Extract home stats caching to method in service
2020-05-07 13:20:30 +02:00
Matt-Yorkley
2292cbaae4
Extract timed enterprise AMS fragment caching options to service
2020-05-07 13:20:28 +02:00
Matt-Yorkley
2876b98155
Use time-based caching on rendered AMS data for shops
2020-05-07 13:11:53 +02:00
