Pau Pérez Fabregat
3f593d6246
Merge pull request #5440 from luisramos0/grumpy_cat
...
Fix Grumpy Cat on shop page (cart with items from a closed OC)
2020-05-22 18:38:41 +02:00
Luis Ramos
9a71ffc093
Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
...
Cart stock UX
2020-05-22 14:21:16 +01:00
Pau Perez
e339a37cd5
Allow to create order_cycle_schedules
...
There's no way we can create an order_cycle_schedules if the schedule
doesn't have an id, which we can't get if to persist it we need an OC
first, which in turn, will create an order_cycle_schedules.
2020-05-22 14:22:31 +02: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
Pau Perez
be9fbae300
Fix misplaced paragraph in shop tab
...
By wrapping message within 12-cols container, keeping consistency with
the other shop tabs.
2020-05-22 12:37:07 +02:00
Luis Ramos
b7c601abcd
Merge pull request #5424 from luisramos0/ship_method_warning
...
Add warning to enterprise Shipping Method list and to Shipping method edit page
2020-05-22 11:24:12 +01:00
Robin Klaus
53c0bcbd0b
Changed translation syntax to normal t() call and lazy lookup.
2020-05-22 13:22:57 +10:00
Luis Ramos
12f512e98b
Move arrow on OC selector a little to the right so it's centered between end of text (if max length reached) and border
2020-05-21 15:41:26 +01:00
Luis Ramos
b2bfe28173
Remove extra right pad on OC selector, in mobile, this will make the selector be centered
2020-05-21 15:38:55 +01:00
Luis Ramos
ed14a92c7b
Make OC selector wider to support more characters where there is enough space for that
2020-05-21 15:38:54 +01:00
Pau Pérez Fabregat
16dfb3c7e9
Merge pull request #5408 from luisramos0/columns_params
...
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
2ae34d8df3
Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page
...
change shop name to be link to shop on transactions page
2020-05-21 10:56:19 +01:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
cf0ad179a1
Move hubs_sidebar to the last 4 columns at the top of the page
2020-05-21 10:45:58 +01:00
Maikel
da55956a6e
Merge pull request #5392 from luisramos0/ship_method_bo
...
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
Luis Ramos
76b721b663
Merge pull request #5457 from Matt-Yorkley/cart-fix
...
Fix cart fields sharing same scope
2020-05-19 19:31:49 +01:00
Matt-Yorkley
3df2d4721b
Fix search bar in /shops and /groups
2020-05-19 14:00:20 +02:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Matt-Yorkley
4a837e8c07
Fix display issue on order cycle form
...
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d
Fix cart fields sharing same scope
...
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
2020-05-19 10:23:12 +02:00
Lucas Hiago
ba30f55e70
Add fullwidth for table selector
2020-05-18 22:53:46 -03:00
Eduardo
6d54e6d4a0
change SearchOrders service to search with shipping_method
2020-05-18 20:44:55 -03:00
Eduardo
473b4c63c4
add Shipping Method filter to admin/orders page
2020-05-18 18:46:43 -03:00
Matt-Yorkley
e3c337ef7e
Fix mixed error display issue
2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc
Use fresh scope for each quantity field
2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799
Update invalid input feedback
2020-05-18 16:14:14 +02:00
Matt-Yorkley
f7b4717f29
Improve validation code
2020-05-18 14:51:11 +02:00
Matt-Yorkley
fe27c8466e
Add feature specs for full cart page stock correction process
2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4
Update cart page links to be disabled when changes are required and form is unsaved
...
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432
Fix tab-buttons element overlapping order cycle selector
2020-05-18 14:27:05 +02:00
Luis Ramos
ea8157a5c6
Merge pull request #5304 from dacook/5299-orders-filter-several-tags
...
5299 Impossible to filter orders with several tags
2020-05-18 11:25:54 +01:00
Luis Ramos
37350fcbb0
Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query
2020-05-18 10:55:03 +01:00
Luis Ramos
6c81c19f00
Remove dead code
2020-05-16 14:19:25 +01:00
Robin Klaus
438c0ecde9
delete extra lines
2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac
Added input code to two additional pages to cover shop tab search boxes
2020-05-16 12:56:06 +10: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
21d1a7bc04
Remove dead code
2020-05-15 19:29:37 +01:00
Luis Ramos
6827ce5c7f
Refactor order.set_order_cycle, return early and remove indentation
2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b
If selected OC is not in the available OCs, empty the order
2020-05-15 19:29:35 +01:00
Lucas Hiago
98cbe5762a
Remove unused css property from image in cancel email
2020-05-15 10:59:56 -03:00
Lucas Hiago
0caa91d057
Remove second table of cancel email instructions style
2020-05-15 10:59:56 -03:00
Lucas Hiago
f72da4abe4
Add refund message in order cancel mail
2020-05-15 10:59:56 -03:00
Lucas Hiago
42012d6482
Add new order sumary in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
1c1200125e
Add new greeting table in order cancel mail
2020-05-15 10:59:55 -03:00
Lucas Hiago
0b8771ccf0
Add connect with us footer to order cancelation email
2020-05-15 10:59:55 -03:00
Luis Ramos
52e7ca2417
Select first default OC only if no OC is already selected
2020-05-15 14:26:56 +01:00
