Julius Pabrinkis
5caaec8ef3
Extract translations from mailers and helpers
2017-07-21 12:17:12 +10:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
Rob Harrington
74d8dc48b4
Rewriting shopfront alert regarding changeable orders to be dynamic
2017-05-18 15:35:07 +10:00
Rob Harrington
fab6d70832
Changeable orders only returns orders if the shop allows changes
2017-05-12 16:11:16 +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
8c8b40c5a8
Showing order cycle close time on banner when multiple open orders are present
2017-05-05 14:20:57 +10:00
Rob Harrington
c0445d46f3
Changeable orders ignores cancelled orders
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
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
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
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
Pierre de Lacroix
4a9c17cb28
better tax aggregation
2017-04-27 17:32:36 +10:00
Rob Harrington
bea0b2b1e5
Adding feature toggle for receipt printing using qz
2017-03-15 16:39:04 +11:00
Pierre de Lacroix
70707969f3
Add Qz integration
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
cc1ef5b28b
fixes on invoice and tax report
2017-03-15 15:04:57 +11:00
Pierre de Lacroix
3fc2070b2c
fix aggregation of taxes for taxes on adjustments
2017-03-15 15:03:46 +11:00
Pierre de Lacroix
2d2792225a
change invoice layout to include amount for each relevant tax rate
2017-03-15 15:03:18 +11:00
Matt-Yorkley
6bed94a09b
Include E2E permissions
2017-01-22 18:42:23 +00:00
Rohan Mitchell
43726a0b23
Fix inventory link not appearing on menu
2016-12-08 10:38:29 +11:00
Rohan Mitchell
6e6efea328
Fix groups link not appearing on menu
2016-12-08 10:38:23 +11:00
Maikel Linke
a2a6ce1b3e
Revert "TEMP: Remove override for no-longer-present method"
...
This reverts commit a3b91dabe5
2016-12-08 10:38:21 +11:00
Maikel Linke
3a69c958ef
Hide super admin menu items for enterprise users
...
Imported temporarily missing Spree functionality. This patch becomes
obsolete with another Spree upgrade.
2016-12-08 10:38:21 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4034b1065
Fix spec
2016-11-04 09:39:17 +11:00
Rohan Mitchell
3e565ad7cb
Mark admin enterprises form dirty when property removed
2016-11-04 09:39:17 +11:00
Rohan Mitchell
f33df883a0
Fix link_to_remove_fields - does not immediately delete the field
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a3b91dabe5
TEMP: Remove override for no-longer-present method
2016-11-04 09:39:17 +11:00
Maikel Linke
7c3968b64e
Hide guest checkout if deactivated
2016-10-05 15:41:09 +11:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4ee8f96e4818
2016-09-18 17:46:43 +10:00
Rohan Mitchell
3ca42ae055
Extract ids_to_objs to SerializerHelper
2016-09-16 11:36:27 +10:00
Rohan Mitchell
e00846776e
Client-side, always show properties by their presentation, not their name
2016-09-16 11:36:26 +10:00
Rob Harrington
da55eb6d27
Form for changing enterprise type specifies trial length
2016-09-07 11:13:05 +10:00
Bing Xie
8234956a61
Inject available countries on admin customers page
2016-08-12 14:44:59 +10:00
Rohan Mitchell
87e063593a
Add feature toggle helper, allow hash or string queries
2016-08-03 16:07:15 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rohan Mitchell
b637b5b75a
Remove CMS helper: home_page_cms_content
2016-07-29 09:14:36 +10:00
Maikel Linke
984641e46c
Merge remote-tracking branch 'origin/master' into uk/trial-length
...
Conflicts:
config/locales/en.yml
2016-07-20 11:40:52 +10:00
Maikel Linke
ddb54d1924
Delete fee on payment method if payment invalid
...
PayPalExpress is always creating two payments. The first one is
invalidated and the second one succeeds. Without deleting the old fee on
the invalidated payment, the order lists the fee twice.
2016-07-15 17:43:26 +10:00
Maikel Linke
f733c7f207
Include shop enterprise on shop front
2016-07-06 12:45:12 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +10:00
Continuous Integration
e252414263
Auto-merge from CI [skip ci]
2016-06-30 01:30:53 +10:00
Maikel Linke
08fdc8a5bd
Load producers of all or selected order cycles into shop
2016-06-29 12:57:09 +10:00
Maikel Linke
e284ad62b2
Inject only relative enterprises into shopfront
...
Other shops displayed in producer modals are lazy loaded when opening
their modal.
2016-06-17 17:15:16 +10:00
Rob Harrington
7028fbe288
Find current_customer via current_distributor and current_user rather than current_order
...
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
2016-05-28 00:31:59 +10:00
Rob Harrington
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
2016-05-27 16:25:10 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
