raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,407 Commits 18 Branches 452 Tags
fa30e28335d2fa291d59db8ccb12ffb3e4e27dad
Commit Graph

3109 Commits

Author SHA1 Message Date
Rohan Mitchell
fa30e28335 Update spec: Our pricing calculations are now consistent between the frontend and backend carts 2016-08-26 09:28:29 +10:00
Rohan Mitchell
b0eebc2e45 Round FlatPercentItemTotal calcs per-item before summing full quantity 2016-08-26 09:28:29 +10:00
Rohan Mitchell
7b2f65a965 Refactor spec so we can have different products in the cart 2016-08-26 09:28:29 +10:00
Rohan Mitchell
0dc12d8791 Parameterise add_product_to_cart spec helper method 2016-08-26 09:28:29 +10:00
Bing Xie
ed1f05e674 Show successful message 2016-08-12 16:31:49 +10:00
Bing Xie
98f3e15d87 Updating customer address feature tests 2016-08-12 14:44:59 +10:00
Bing Xie
95c152420c Test customer model updating shipping address 2016-08-12 14:44:59 +10:00
Bing Xie
5b40c745f3 Add address serializer to customer serializer 2016-08-12 14:44:59 +10:00
Bing Xie
34d5df69a5 Fix failed customers controller spec 2016-08-12 14:44:59 +10:00
Bing Xie
7f203f5491 Show billing address and shipping address on customers index page 2016-08-12 14:44:59 +10:00
Bing Xie
add39f7401 Enterprise user can update customer's name 2016-08-12 14:44:59 +10:00
Rob Harrington
47df8d6d8e Refactoring AngularJS Shop Variant filtering logic for improved speed 2016-08-10 12:08:03 +10:00
Rob Harrington
f9b58b7b90 Ensure bill is > 0 for spec 2016-08-10 12:08:03 +10:00
Rob Harrington
b957555c82 Adding infinite-scroll to the shopfront 
For performance improvement with large data sets
 2016-08-10 12:08:03 +10:00
Rohan Mitchell
1054fd2d05 View closed shops by URL 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
243dfa7a93 Add retry for intermittently failing spec in variant overrides 2016-07-29 11:01:52 +10:00
Rohan Mitchell
d9d3a4a645 Set up producer filters on group producers page 2016-07-29 11:01:52 +10:00
Rohan Mitchell
b13360d2d0 Extract filter helpers from individual spec to spec helper 2016-07-29 11:01:52 +10:00
Rohan Mitchell
13cf5d29de Add guard for selector overflow (only seen in phantom, not selenium/firefox or dev server/chrome) 2016-07-29 11:01:52 +10:00
Rohan Mitchell
ba854d12c8 Remove CMS specs 2016-07-29 09:14:36 +10:00
Maikel Linke
dee0fa6724 Trigger checkout click more reliably in specs 2016-07-22 14:10:16 +10:00
Maikel Linke
e57c06c610 Use require_relative introduced in Ruby 1.9.2 
The new `require_relative` command is much shorter and easier to read
then the previous:

    -require File.expand_path('../config/application', __FILE__)
    +require_relative 'config/application'
 2016-07-20 16:07:35 +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
b5bc3a4ca3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load 2016-07-13 10:01:16 +10:00
Rohan Mitchell
e373284934 Fix intermittent spec failure 2016-07-06 16:14:32 +10:00
Rohan Mitchell
13c8f0a230 Improve spec reliability 
It seems that the success message on the customers page is disappearing before the spec can
detect it. This seems unlikely since it's present for 3 s, but this is my best theory right now.
 2016-07-06 15:29:04 +10:00
Maikel Linke
52f68dac33 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load 2016-07-06 11:35:26 +10:00
Rohan Mitchell
f09cd9e477 Allow groups to be searched by URL 2016-07-06 11:08:38 +10:00
Rohan Mitchell
d6f21b24da Add specs for producers and shops search by URL 2016-07-06 11:08:38 +10:00
Bing Xie
78b22c4a82 Fix incorrectly aligned columns 2016-06-30 21:38:10 +10:00
Continuous Integration
e252414263 Auto-merge from CI [skip ci] 2016-06-30 01:30:53 +10:00
Lynne Davis
320db21d5c Updating spec with $ (not £) for automated testing 2016-06-29 16:30:11 +01:00
Maikel Linke
c253d73d11 Refactoring with feedback on pr #1073 2016-06-29 15:46:51 +10:00
Maikel Linke
08fdc8a5bd Load producers of all or selected order cycles into shop 2016-06-29 12:57:09 +10:00
Rohan Mitchell
a5a00e9cef Show taxons and properties on producer modal (seen on map, shop producer info) 2016-06-24 07:57:06 +10:00
Rohan Mitchell
4134cbfc9c Include producer properties on producer listing 2016-06-24 07:57:06 +10:00
Rohan Mitchell
58379a5e28 Extract property merging to lib class 2016-06-24 07:57:06 +10:00
Rohan Mitchell
aae1689a27 Show product properties on producers page 2016-06-24 07:57:06 +10:00
Rohan Mitchell
4338f632f6 Add scope: Spree::Property.applied_by 2016-06-24 07:57:06 +10:00
Rohan Mitchell
fa0cc6f2c8 Add spec for filtering producers by taxon 2016-06-24 07:57:06 +10:00
Rob Harrington
d28c0159ab Use have_selector x, count: y; instead of all(x).count.should == y 2016-06-17 16:44:02 +10:00
Rob Harrington
1e142aa628 Refactoring OrderCycleFormApplicator logic for improved update speed 2016-06-17 16:44:02 +10:00
Rob Harrington
6586e67a5c Better messaging around deletion of customers 2016-06-17 14:47:04 +10:00
Rob Harrington
61969f5c84 Ensure CustomersController#update.json gives an appropriate response 
pendingChanges submits an empty string when a field is blank (rather than undefined)
 2016-06-16 22:42:53 +10:00
Rob Harrington
a909f0ddb8 Merge remote-tracking branch 'origin/master' into pr/1033 2016-06-16 15:12:30 +10:00
Rob Harrington
25cdd4af8e Preventing shop from being changed when unsaved customer changes exist 
Also making layout of filters on customer index more consistent with other pages
 2016-06-16 15:10:16 +10:00
Continuous Integration
9ba07a2afb Merge remote-tracking branch 'origin/master' into HEAD 2016-06-15 11:26:02 +10:00
Bing Xie
a39d15d685 Fix failed adds a new tag rule js test 2016-06-15 10:51:34 +10:00
Rob Harrington
8221f1f193 Use scope. to ensure that tag rule sorting is applied 2016-06-15 10:51:34 +10:00