raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,245 Commits 18 Branches 451 Tags
f984871b23e262fa00a67ae6b7765c62073d4b9c
Commit Graph

784 Commits

Author SHA1 Message Date
Maikel Linke
ad1ef877c0 Warn about duplicate customer codes 
The admin customer page displays a warning you change a code to an
existing one.
 2016-06-10 09:09:56 +10:00
Maikel Linke
489feb4e01 Longer default page size for feature specs 2016-06-01 16:28:43 +10:00
Rob Harrington
07384edb2d Can delete default tag rules 2016-05-27 22:00:08 +10:00
Rob Harrington
12e685bd92 Restricting number of tags for tag rules to one 2016-05-27 16:25:10 +10:00
Rob Harrington
a1c7a44fa0 Tag Rules can be rearranged in UI to set priority 2016-05-27 16:25:10 +10:00
Rob Harrington
011c8c74d9 Updating remove button character for tags in ngTagsInput 2016-05-27 16:25:10 +10:00
Rob Harrington
fa3b43a970 Adding default tag rules 2016-05-27 16:25:10 +10:00
Rob Harrington
bf0db2287b More structured layout for Tag Rules UI 2016-05-27 16:25:10 +10:00
Rob Harrington
c568ac4d64 Re-adding button clicks removed in 885d489bc3 2016-05-27 16:25:10 +10:00
Rob Harrington
9b12b86053 Simplifying supplier and distributor row counts 2016-05-27 16:25:10 +10:00
Rob Harrington
84817b0124 Fixing specs broken by faster PhantomJS 2016-05-27 16:25:10 +10:00
Rob Harrington
5624fa0c5e Adding FilterOrderCycles tag rules to UI 2016-05-27 16:25:10 +10:00
Rob Harrington
9dc1294ec5 Outgoing exchanges can be tagged 
Using panels infrastructure to display tags and products interfaces
 2016-05-27 16:25:10 +10:00
Rob Harrington
e999b5715a Adding FilterPaymentMethods rules to tag rule UI 2016-05-27 16:25:10 +10:00
Rob Harrington
e21735b037 Removing naughty save_screenshot call from payment method spec 2016-05-27 16:25:10 +10:00
Rob Harrington
4d83bf2135 Payment methods can be tagged 2016-05-27 16:25:10 +10:00
Rob Harrington
eedb2854ec Adding FilterProducts rules to tag rule UI 2016-05-27 16:23:26 +10:00
Rob Harrington
3f8420b0e9 Adding tags to variant overrides 2016-05-27 16:23:26 +10:00
Maikel Linke
0af8377844 Add payment method fees to order during checkout 
The fee is displayed as "Transaction fee".
 2016-05-25 14:56:52 +10:00
Maikel Linke
63432c2acc Resize tested page to find all products 2016-05-25 11:45:18 +10:00
Rob Harrington
b9f6cb8800 Adding translations for all column names 2016-05-25 08:10:20 +10:00
Rob Harrington
3647b17110 Removing save_screenshot call 2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a Refactoring save-bar 2016-05-25 08:10:20 +10:00
Rob Harrington
564c1a3650 Improvements to customers page 
Create customer from dialog

Limiting the number of products shown as once

Adding SaveBar and StatusMessage
 2016-05-25 08:10:20 +10:00
Rob Harrington
7e932f091d Use have_current_path rather than current_path.should == 2016-05-25 08:10:20 +10:00
Rob Harrington
245db8971a Fixing specs broken by faster PhantomJS 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
Rob Harrington
383f7c57aa Wait for login before visiting CMS 2016-05-25 08:10:20 +10:00
Rob Harrington
10133a13f2 Make sure that changes are saved before attempting to click link 2016-05-25 08:10:20 +10:00
Rohan Mitchell
8c747f02b5 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar 2016-05-11 14:41:41 +10:00
Bing Xie
a37820a963 Resize window to fix failed test 2016-05-06 14:55:16 +10:00
Bing Xie
08f0011244 Make the page long enough to avoid the save bar overlaying the form 2016-05-06 12:43:50 +10:00
Bing Xie
57ec7bb9a9 Remove unused test code 2016-05-04 12:45:23 +10:00
Bing Xie
8b5e5105a8 Fix failed tests 2016-05-04 12:45:23 +10:00
Bing Xie
1833f0dd5d Add save_bar to the order cycles simple editing form 2016-05-04 12:45:23 +10:00
Bing Xie
885d489bc3 Fix failed test for the default form 2016-05-04 12:45:23 +10:00
Rohan Mitchell
9ac6de4215 Admin can set bugherd API key 2016-05-04 11:42:07 +10:00
Rob Harrington
6c5aaef86e Removing ability to create order discount rules 
Issue with application of tax to discounted items is yet to be resolved
 2016-04-01 21:31:36 +11:00
Rob Harrington
d278b72289 Updating Tag Rules UI to allow management of new FilterShippingMethods rule type 2016-04-01 19:48:25 +11:00
Rob Harrington
82bc26fe90 Splitting tag rule feature specs out into their own spec file 2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4 Shipping methods can be tagged 2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591 Relevant DiscountOrder tag rules are applied to orders on update 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf Enterprise users can create tag rules 2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f First cut at an interface for updating tag rules 2016-04-01 19:48:25 +11:00
Maikel Linke
d12c486dd2 Use new spree_paypal_express branch to hide password 2016-04-01 15:48:21 +11:00
Maikel Linke
813dff8af2 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login 2016-04-01 11:04:36 +11:00
Maikel
d51cfccd7e Auto-merged master into i18n-hackathon on deployment. 2016-03-23 10:09:36 +11:00
Maikel Linke
a48b992ec0 Shops can require users to login 
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.

Closes #849.
 2016-03-18 16:46:28 +11:00
Rohan Mitchell
16741598fd Merge branch 'master' into products-caching 
Conflicts:
	spec/features/admin/variant_overrides_spec.rb
 2016-03-18 09:59:56 +11:00