Julius Pabrinkis
1920ee7e88
Extract translations from serializers and overrides
2017-07-21 12:17:12 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Rob Harrington
8b560e6cee
Cleaning up angular variant units controllers a little bit
2017-05-24 15:05:33 +10:00
Matt-Yorkley
7974ac45f2
Add unit description placeholder
2017-05-24 15:05:33 +10:00
Matt-Yorkley
41b5cf10dd
Quick testing update
2017-05-24 15:05:33 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Rob Harrington
848193434b
Show item single_display_amount instead of variant price in order details table
...
Also has the effect of taking the inventory price into account (since it is stored against the line item price)
2017-05-19 17:27:04 +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
3b4ffe1f70
Suppress line item validation error for newly-created orders
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
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
Matt-Yorkley
80d8d18eb2
Update terms of service config
2017-04-05 15:48:50 +10:00
Rob Harrington
903d1afb53
Stripping html tags from products description on new form as well
2017-04-05 14:29:23 +10:00
Matt-Yorkley
cd55d2e2ff
Product Description - strip weird tags on paste
...
squashme
2017-04-05 11:29:35 +10:00
Rob Harrington
05cf8c4351
Sanitizing product description for textAngular input
2017-04-05 11:29:35 +10:00
Matt-Yorkley
7b370a2eb6
Removed underline option
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c4bd085393
Added Angular and textAngular to edit product page
2017-04-05 11:29:35 +10:00
Matt-Yorkley
fcb9e9fa56
Changed buttons
2017-04-05 11:29:35 +10:00
Matt-Yorkley
3591354cb1
Minor tweaks
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c43dea60b7
Product Descriptions formatting
2017-04-05 11:29:35 +10:00
Lynne Davis
0d5fde919b
Property name spans signle col heading
2017-03-29 14:47:17 +11:00
Matt-Yorkley
429ef4e2ba
Altered product property headings for issue #522
2017-03-29 14:44:30 +11:00
Lynne Davis
e8999d23e1
Updated translations
2017-03-29 13:12:29 +11:00
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
