Pau Pérez Fabregat
45573dc522
Merge pull request #6753 from jibees/6746-epic-fullwdith-admin-layout-quick-wins
...
FullWidth admin layout quick wins
2021-01-28 21:10:06 +01:00
Pau Pérez Fabregat
0a1d4873e3
Merge pull request #6736 from jibees/6707-remove-anchor-jump
...
Remove anchor in URL so avoid browser scrolling to the top of the page when editing order
2021-01-28 21:09:08 +01:00
Pau Pérez Fabregat
2668747237
Merge pull request #6723 from luisramos0/spree_routes_2
...
Move spree orders routes out of the spree engine routes into the main app routes
2021-01-28 16:31:49 +01:00
Maikel
8a757812e7
Merge pull request #6735 from coopdevs/enable-mail-delivery-always
...
Enable mail delivery always
2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3
Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments
...
Delete dead code Spree::Order#price_adjustments
2021-01-27 23:29:38 +01:00
Pau Pérez Fabregat
c3897dd3df
Merge pull request #6643 from coopdevs/customer-balance-frontoffice
...
Customer balance frontoffice
2021-01-27 19:55:56 +01:00
Jean-Baptiste Bellet
9b1c0e6806
avoid inserting div in the columns grid system
...
it break the css selectors (as :first-child, ...)
fixe: #6747
2021-01-27 15:05:48 +01:00
Jean-Baptiste Bellet
c5edd74d05
remove useless wrapper and align items (both right and left)
...
Fixe: #6747
2021-01-27 15:04:45 +01:00
Jean-Baptiste Bellet
a6fba8a065
Put content into grid columns system
...
Two columns of three + a ten column rather than empty column + content outside column system
correct #6745
2021-01-27 14:40:50 +01:00
Matt-Yorkley
feca9e7838
Improve hubs sidebar in payment methods edit
2021-01-27 11:38:01 +00:00
Matt-Yorkley
398b4a09a1
Improve enterprise fees calculator fields
2021-01-27 11:38:01 +00:00
Matt-Yorkley
b5ab6cbf69
Improve button spacing in enterprises submenu
2021-01-27 11:38:01 +00:00
Matt-Yorkley
e762c1d02f
Adjust buttons layout on enterprise shipping and payment methods page
2021-01-27 11:38:01 +00:00
Matt-Yorkley
f72cd6222f
Adjust variant columns in inventory pages
2021-01-27 11:38:01 +00:00
Matt-Yorkley
539ff228e0
Adjust form layout on order cycle edit form (simple view)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d40ec2d63c
Adjust order cycle edit form layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b
Adjust dashboard layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
52cfa0a103
Remove old Javascript hacks for the main menu and replace with flex-based CSS properties
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea
Tweak some styles and layout classes
2021-01-27 11:38:01 +00:00
Luis Ramos
34ae3ca24d
Replace spree_order_url with order_url so we can use scope in the routes file
2021-01-25 19:56:25 +00:00
Luis Ramos
f3da7afd55
Replace spree_order_path with order_path so we can use scope in the routes file
2021-01-25 19:55:42 +00:00
Luis Ramos
d52661fe0a
Fix admin order form to use admin orders route
2021-01-25 19:52:48 +00:00
Luis Ramos
00fcb89af1
Fix order_url routes in a few places
2021-01-25 19:52:48 +00:00
Luis Ramos
dd4ca8a8e6
Fix order path in subs emailer view
2021-01-25 19:52:48 +00:00
Luis Ramos
3813b80615
Adapt order path route in order details view
2021-01-25 19:52:48 +00:00
Luis Ramos
60c3557c2d
Fix checkout form order path
2021-01-25 19:52:48 +00:00
Luis Ramos
6e7ee02191
Change spree.order_path to spree_order_path everywhere
2021-01-25 19:52:48 +00:00
Jean-Baptiste Bellet
686dcaaa1b
remove '#' as path for link_to
...
Adding '#' to the current url makes most of browser jump to the top of the page. Avoid this by deleting this added # (meaningless) and replacing it by empty string.
2021-01-25 16:09:12 +01:00
Pau Perez
4a5869b60c
Remove ability to toggle mail delivery
...
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
2021-01-25 13:27:44 +01:00
Matt-Yorkley
0247386f82
Delete dead code Spree::Order#price_adjustments
...
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
2021-01-23 00:05:56 +00:00
Andy Brett
84689c43be
Merge pull request #6534 from andrewpbrett/sca-emails
...
Send email when SCA authorization is required for admin payment
2021-01-21 13:53:35 -08:00
Andy Brett
0e7f4b2f14
Merge pull request #6537 from mkllnk/simplify-mail-config
...
Simplify mail config
2021-01-21 10:59:43 -08:00
Andy Brett
70f30f5224
Merge pull request #6658 from andrewpbrett/item-counter-fix
...
Further fix #5989 (Item counter accepts values higher than the available stock)
2021-01-21 10:56:18 -08:00
Andy Brett
d9b27bc556
move controller and mailer outside of spree namespace; use haml in template
2021-01-21 09:18:29 -08:00
Andy Brett
802e49bed3
add PaymentMailer and send email if payment auth is required
2021-01-21 08:24:01 -08:00
Cillian O'Ruanaidh
40f9b063fe
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-21 08:24:01 -08:00
Andy Brett
77419a1e4b
Merge pull request #6675 from cillian/single-new-product-view
...
Remove ability to create new product from products page, use /admin/products/new instead.
2021-01-20 19:23:33 -08:00
Andy Brett
e31d566f7f
Merge pull request #6283 from luisramos0/sets
...
Move sets out of app/models to app/services/sets
2021-01-20 19:22:15 -08:00
Andy Brett
ca37976661
Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component
...
Create a reusable "loading spinner" component
2021-01-20 19:21:31 -08:00
Pau Perez
caf1c9ecd9
Move data fetching from injection helper to action
...
Data fetching is a controller action responsibility. We shouldn't couple
the controller with it too much but it should trigger it, not the
view-layer.
2021-01-20 18:23:22 +01:00
Cillian O'Ruanaidh
79668e06a7
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-15 10:24:50 +00:00
Andy Brett
18dcbbd892
Merge pull request #6613 from Matt-Yorkley/variant-override-serialization
...
Don't serialize all variant override objects where they are not needed
2021-01-14 10:59:11 -08:00
Andy Brett
81ea71af94
Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field
...
remove asterisk on 'display as' field unit value for a product
2021-01-14 10:09:15 -08:00
Pau Pérez Fabregat
929ae82e00
Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal
...
Bye Bye Spree Paypal
2021-01-14 18:16:44 +01:00
Luis Ramos
5d6d7f7ad0
Adapt enterprise fees code and specs to new namespace of Sets::EnterpriseFeeSet
2021-01-14 09:41:07 +00:00
Luis Ramos
96a351ad0e
Adapt usage of Sets to their new location
2021-01-14 09:41:07 +00:00
Maikel Linke
be229c9002
Simplify email config by removing unused option
...
Spree used to give you more options to configure ActionMailer but our
setup is much simpler. We can remove unused code.
The removed option was never used by OFN and defaulted to true. We don't
need a database migration because the value isn't set in the database.
2021-01-14 12:05:41 +11:00
Andy Brett
8c4d12a501
limit item counter to max quantity available even if amount is manually filled in
2021-01-13 16:23:41 -08:00
Matt-Yorkley
5f2dc38241
Merge pull request #6098 from brymut/item-counter-fix
...
Fix #5989 Item counter accepts higher amount than available stock
2021-01-13 22:33:08 +01:00
Jean-Baptiste Bellet
dcbf02bc47
remove asterisk on 'display as' field unit value for a product
...
as it's not a mandatory field
2021-01-13 11:30:08 +01:00