Matt-Yorkley
6e5c878491
Product Import cancan permissions and ui tab
2017-03-17 16:11:52 +11:00
Pierre de Lacroix
2fe25c6219
Allow both invoice layouts to coexist
...
Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts
2017-03-15 15:06:28 +11:00
Matt-Yorkley
a62998e5f1
Enterprise Terms of Service
2017-02-22 13:40:17 +11:00
François Turbelin
ebcb8ff3e7
Finishing Translations keys implemtentation on Admin ERB views
2017-02-19 22:08:34 +01:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Matt-Yorkley
bc5672b5eb
Added translation
2016-12-20 13:30:24 +00:00
Rob Harrington
d0509b54bf
Disabling override the adds coupon field to cart page
2016-11-30 18:30:20 +11:00
Matt-Yorkley
7981feefa1
Updated form to include help tip for clarity
2016-11-28 14:38:13 +00:00
Matt-Yorkley
3e77534dcf
Product variant form script
2016-11-25 01:31:45 +00:00
Bing Xie
1caf648fe5
Move customer search to directive
2016-10-21 10:51:36 +11:00
Bing Xie
63dc48a075
Override customer search UI
2016-10-21 10:51:36 +11:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
Rob Harrington
385fd91e70
Adding angularjs payment method controller, updating payment method edit form
2016-05-27 16:25:10 +10:00
Maikel Linke
e4f855b64a
Display calculator in payment method edit form
2016-05-25 14:56:52 +10:00
Maikel Linke
03f98af60b
Merge remote-tracking branch 'origin/master' into uk/spree-google-analytics
2016-05-25 10:05:09 +10:00
Rob Harrington
ddcfe1535a
Making TagRule autocomplete available to models other than Customer
...
Incorporate ng admin.tags module and rails TagController into existing admin.tagRules module + TagRuleController
2016-05-25 08:10:20 +10:00
Rob Harrington
af5eec7094
WIP (Angular 1.4 Upgrade): Adding filters to ofn-select2 and using on order create/edit UI
2016-05-25 08:10:20 +10:00
Paul Mackay
6dd989484a
Switch to using the Spree GA tracker code
2016-05-10 05:32:40 +01:00
elf Pavlik
f15e948085
small i18n fixes #878
2016-04-14 16:10:21 -05:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4
Renaming angular admin.shipping_methods and admin.payment_methods modules
2016-04-01 19:48:25 +11:00
Rohan Mitchell
422061f137
Merge branch 'master' into products-caching
...
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
2016-03-03 09:42:52 +11:00
Rob Harrington
4de0a5c220
Renaming 'Variant Overrides' index page to 'Inventory'
2016-03-02 12:10:22 +11:00
Rohan Mitchell
ec55af5b8a
Display products cache integrity checker results on cache settings admin page
2016-03-02 11:05:03 +11:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Rohan Mitchell
bdd6d3ba6b
Replace with-tip with ofn-with-tip: business model configuration
2016-02-24 11:26:37 +11:00
Rob Harrington
da325780b1
Adding BMC link to configurations menu
2015-12-16 19:18:57 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Rohan Mitchell
e33ede0ec2
Include order cycle status in new order form
2015-12-11 13:06:58 +11:00
Rohan Mitchell
76d4fbccf9
Use select2 for order cycle selection
2015-12-11 13:06:58 +11:00
Rohan Mitchell
932ac45ea5
Do not show form until distribution has been chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
3419198635
Disable distributors that do not have an order cycle
2015-12-11 13:06:57 +11:00
Rohan Mitchell
1026b81d0c
Do not show order cycle choice until distributor is chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
c74463404d
Only show order cycle options that include the chosen distributor
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2daceb1111
Angularise new order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
47c23c986a
Move distribution fields from override to partial
2015-12-11 13:06:56 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rohan Mitchell
d794981ecf
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
2015-11-11 11:53:04 +11:00
Rob Harrington
db4e8382e4
Oops, updating template to make order filtering work
2015-11-05 14:05:14 +11:00
Rob Harrington
18a7317185
Merge branch 'account-invoices' into line_item_naming
...
Conflicts:
app/models/spree/line_item_decorator.rb
2015-10-28 13:42:27 +11:00
Rob Harrington
cdb0c2db33
Admin Orders show page uses line_item.full_name to describe line_items
2015-10-28 13:07:32 +11:00
Rob Harrington
e52f7165c3
Overriding any last references to options_text in the spree codebase
2015-10-28 13:07:31 +11:00
Rob Harrington
6dfae1b014
Whitespace crusader
2015-10-28 13:07:31 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Maikel Linke
f152e4054c
Remove obsolete deface
2015-10-21 10:04:29 +11:00
Maikel Linke
62d31f79ed
Remove obsolete deface
2015-10-21 10:04:28 +11:00
Rob Harrington
f12fd7b4a3
Adding button for print action to admin orders show page
2015-10-16 17:25:40 +11:00
