Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d
Fix wrong key replacement for producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
5f8890e963
update producers pack translation key from sell_description_text to producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
58c463497a
#1541 fixing wrong translation key in producers packs
2017-07-21 11:15:03 +10:00
Duende13
b2bae242d9
Sorting variants by name_to_display and unit_value. Issue 1604.
2017-07-21 10:18:55 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Continuous Integration
931a5be162
Merge remote-tracking branch 'origin/master' into HEAD
2017-06-22 13:19:25 +10:00
Maikel Linke
e437cba155
Make style flexible for all sizes of logos
...
Trying to support logos that are big. But logos that are too small
should not be stretched either, better small than ugly.
Remove static size declaration from HTML template since it doesn't
reflect the logo size.
Unfortunately, there are other CSS files that are in conflict. The file
mail/email.css.scss defines this globally:
img {
max-width: 100%;
}
2017-06-16 16:49:43 +10:00
Maikel Linke
3330e9b219
Init registration form with default country
2017-06-14 16:47:02 +10:00
Julius Pabrinkis
0083733c4c
#1471 Do no let long producers' name go under icon
2017-06-02 16:29:43 +10:00
Pierre de Lacroix
6972822c49
fix escaping problems on ticket view
2017-05-24 13:35:59 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
stveep
38c25c412f
Remove duplicated spec, better error message suppression, fix shipping test to wait correctly
2017-05-19 16:14:22 +10:00
stveep
4699c654fc
Fix feature specs for new 'new admin order' flow
2017-05-19 16:10:06 +10:00
stveep
c1c5d00f45
Add new view to set distribution, ensure the scoped variant single item price is used.
2017-05-19 16:10:06 +10:00
stveep
220693f4e3
Starting alternative flow for new manual order
2017-05-19 16:06:43 +10:00
Rob Harrington
1766da9d60
Adding ng-cloak directive to changeable orders banner
2017-05-19 15:54:55 +10:00
Rob Harrington
6fc4a297a0
Fixing race condition on link click in spec/features/consumer/shopping/products_spec.rb
2017-05-19 13:15:30 +10:00
Rob Harrington
74d8dc48b4
Rewriting shopfront alert regarding changeable orders to be dynamic
2017-05-18 15:35:07 +10:00
Rob Harrington
c4fbcb19d0
Only show Admin & Handling fees once on completed order form
2017-05-05 15:28:01 +10:00
Rob Harrington
08e391856c
Ask user to confirm cancellation of order
2017-05-05 15:17:14 +10:00
Rob Harrington
c3eda435eb
Hiding 'Back to Cart' and 'Back to Store' buttons on completed orders when distributor does not match cart
2017-05-05 14:20:57 +10:00
Rob Harrington
07b2f0a7c2
Showing banner for distributor of order on order summary, regardless of current_distributor
2017-05-05 14:20:57 +10:00
Rob Harrington
6c90b4e6d0
Adding alert to order summary, notifying user of remaining time to make changes
2017-05-05 14:20:57 +10:00
Rob Harrington
e79a23a554
Disabling save button on order page until changes are made to the order
2017-05-05 14:20:57 +10:00
Rob Harrington
68c8759af1
Count of items in cart form looks is consistent with rest of UI (ie. uses quantities)
2017-05-05 14:20:57 +10:00
Rob Harrington
0029a1b6cf
Ensure order adjustments are displayed in edit form for customers
2017-05-05 14:20:57 +10:00
Rob Harrington
7ea74ccf4a
Order confirmation redirects 'Back to Cart' if cart is non-empty
2017-05-05 14:20:57 +10:00
Rob Harrington
b55036e165
Adding alert to shopfront to alert user to presence of orders open for editing
2017-05-05 14:20:57 +10:00
Rob Harrington
ae28d7a96b
Adding a link in cart to allow user to edit existing + open orders for same OC
2017-05-05 14:20:57 +10:00
Rob Harrington
316b0915e4
Just display the date that orders can be changed until
...
No fancy moment.js stuff
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
893331c7bb
Adding 'Open Orders' section to the top of customer accounts page
2017-05-05 14:20:57 +10:00
Rob Harrington
b0ff7ca767
Making accounts page orders listing full-width
2017-05-05 14:19:32 +10:00
Rob Harrington
cda43f075b
Moving bought items listing up into main section of cart
2017-05-05 14:19:32 +10:00
Rob Harrington
5d9f92eaa7
Adding 'Cancel Order' button to order confimation interface
2017-05-05 14:19:32 +10:00
Rob Harrington
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Rob Harrington
768240a5ba
Reorganising darkswarm order views into partials
2017-05-05 14:19:32 +10:00
Maikel Linke
12a6f652ad
Warn when allowing guest orders and order changes
2017-05-05 14:19:32 +10:00
Maikel Linke
936df71d0d
Link to bought products on cart page
...
The checkout page was just linking to the cart page, but not scrolling
down.
2017-05-05 14:19:32 +10:00
Maikel Linke
f3f6714472
Add message about previous orders on checkout page
...
The message appears if the user ordered before within the same order
cycle and the shop allows to change previous orders.
2017-05-05 14:19:32 +10:00
Maikel Linke
3bce2eb7b5
Rename translation key checkout to avoid conflicts
...
A top-level translation key `checkout` can't co-exist with translation
keys in the path `checkout`. Moving the old key to
`shared.menu.cart.checkout` avoids conflicts. It also structures the
locale better by view.
2017-05-05 14:19:32 +10:00
Maikel Linke
219ad4a3a7
Reload bought products after choosing order cycle
2017-05-05 14:19:32 +10:00
Maikel Linke
d49469a3e6
Show bought items only if changes are allowed
...
An enterprise can decide to allow changes to orders in open order
cycles. The items of these orders are then displayed in the shopping
cart and can be removed on the cart edit page.
2017-05-05 14:19:32 +10:00
Maikel Linke
4835ef067f
Add feature to remove line items from open order cycle
...
- Add JS controller to send delete requests.
- Add resource controller to destroy items.
- Add authorisation check to abilities.
- Update fees after removing line item.
2017-05-05 14:19:32 +10:00
Maikel Linke
0fe4030d71
Display bought items only if present
2017-05-05 14:19:32 +10:00
Maikel Linke
e8d2d4d96f
Display already bought items in edit cart view
2017-05-05 14:19:32 +10:00
Maikel Linke
65f62c42b9
Display products already ordered in this oc
...
Github issue #1083 , part of standing orders.
For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
Maikel Linke
963b4617a9
Add allow-order-changes option to enterprise
2017-05-05 14:18:20 +10:00
