Pau Perez
4e00c45782
Doc defensive coding needed by pin payments
...
[skip ci]
2020-07-15 16:46:09 +02:00
Luis Ramos
31e072179b
Make method a little simple by extracting method
2020-07-15 15:23:16 +01:00
Maikel Linke
25155cab18
Provide credit card brand to Pin Payments
...
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.
I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
2020-07-15 17:13:46 +10:00
Matt-Yorkley
d78db16abe
Merge pull request #5718 from Matt-Yorkley/available-locales-bug
...
Available locales bug
2020-07-08 12:30:18 +02:00
Luis Ramos
ce1114556d
Merge pull request #5578 from mbudm/issue/3770-manual-update
...
Update orders swagger spec and fix api_key access to orders endpoint
2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e
Merge pull request #5715 from luisramos0/ship_method
...
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
2020-07-06 19:15:50 +01:00
Luis Ramos
ceac8a5d40
Merge pull request #5725 from Matt-Yorkley/admin-order-images
...
Fix default image display in admin order edit
2020-07-06 14:03:56 +01: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
Luis Ramos
ff9133b7aa
Merge pull request #5699 from coopdevs/fix-order-button-radius
...
Make button border radius consistent
2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e
Merge pull request #5446 from luisramos0/sca_refunds
...
Make StripeSCA void action work
2020-07-03 22:45:35 +01:00
Matt-Yorkley
46c40bdf33
Fix default image display in admin order edit
2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f
Merge pull request #5707 from luisramos0/missing_spaces
...
Add space after translations so that translators dont have to guess a space is needed
2020-07-03 16:10:55 +01: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
Luis Ramos
07a44cfaf3
Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process
...
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
2020-07-03 13:48:12 +01: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
Matt-Yorkley
7a00a3ba1e
Rename method and add explanatory comment
2020-07-03 11:52:21 +02:00
Matt-Yorkley
c726340ba3
Extract #save_locale_from_params comment-method
2020-07-03 11:48:39 +02:00
Matt-Yorkley
d2db9b3a66
Merge pull request #5599 from luisramos0/submit_on_enteer
...
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606
Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs
...
Enhancement/5454 make links to shops under Groups > Producers open in new tab
2020-07-02 23:51:59 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d
Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1
2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c
Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521
Move adjuster, estimator, packer and prioritizer to order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c
Move Coordinator from Spree::Stock to OrderManagement::Stock
2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52
Bring method from Spree::Order so that we can move Coordiantor to the order management engine
2020-07-02 21:24:14 +01:00
Luis Ramos
b487185a65
Remove package factory, it is no longer needed, we can just call the Package class in the two places where it is used
2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79
Merge Spree::Stock::Package into OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05
Move Stock::Package to OrderManagement::Stock::Package
2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
Luis Ramos
8e116dd58a
Make ensure_correct_adjustment a public method because we call it in OFN
2020-07-02 21:24:14 +01:00
Luis Ramos
2e33e02d7f
Remove dead code, this method was removed in spree 2.0.4
2020-07-02 21:24:14 +01:00
Luis Ramos
7a03f57da0
Merge shipment decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
494251b7cf
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4e5259f491
Bring shipment from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
bdb40d68e9
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6
Bring Package from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6
Fix easy rubocop issue
2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e
Merge decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131
Bring availability validator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f
Adapt spec to OFN context
2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5
Bring estimator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2
Make packer use BasicSplitter by default
2020-07-02 21:24:14 +01:00