Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Rohan Mitchell
ba854d12c8
Remove CMS specs
2016-07-29 09:14:36 +10:00
Lynne Davis
9e03a130c2
Updating GB translation, from transifex
2016-07-27 18:43:48 +01:00
Maikel Linke
dee0fa6724
Trigger checkout click more reliably in specs
2016-07-22 14:10:16 +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
Maikel Linke
11a702667d
Merge branch 'transifex' into HEAD
2016-07-20 17:12:59 +10:00
Maikel Linke
11ec903131
Merge tag 'v1.8.3' into transifex
2016-07-20 17:11:42 +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
Transifex-Openfoodnetwork
477d48e9da
Updating translations for config/locales/nb.yml [skip ci]
2016-07-15 19:46:47 +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
c6bd548413
Don't trigger deployment for transifex branch
2016-07-15 11:19:19 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
0ff1c95c3d
Keep unreferenced entries when dereferencing in js
2016-07-13 12:08:11 +10:00
Maikel Linke
b5bc3a4ca3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-13 10:01:16 +10:00
Maikel
b587a72eb6
Auto-merged master into transifex on deployment.
2016-07-12 17:44:55 +10:00
Maikel Linke
8e73a2e0d6
Dereference enterprises and taxons later
2016-07-06 16:20:07 +10:00
Rohan Mitchell
e373284934
Fix intermittent spec failure
2016-07-06 16:14:32 +10:00
Rohan Mitchell
b5a9a1b6bf
Add translation for business_model_configuration
2016-07-06 16:14:25 +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
f733c7f207
Include shop enterprise on shop front
2016-07-06 12:45:12 +10:00
Rohan Mitchell
d3c423f7ce
Only perform URL search once, not every time map tiles change
2016-07-06 11:56:41 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +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
Rohan Mitchell
34b2f72ae8
When query changed (typing or autocomplete), update URL. When page loads, perform query search.
2016-07-06 10:44:25 +10:00
Rohan Mitchell
e6bdd2303d
Extract showing search result
2016-07-06 10:44:25 +10:00
Rohan Mitchell
a9a68151ec
Syntax
2016-07-06 10:44:25 +10:00
Rohan Mitchell
f586dbc3e1
Extract OSM tile setup to own directive
2016-07-06 10:44:19 +10:00
Rohan Mitchell
54028f4e7e
Split directive into functions
2016-07-01 15:31:32 +10:00
Rohan Mitchell
e8b83bef41
Simplify responding to search
2016-07-01 15:31:32 +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
9cc0bb831a
Show properties alongside taxons on producer fat view
2016-06-24 07:57:06 +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
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
d28c0159ab
Use have_selector x, count: y; instead of all(x).count.should == y
2016-06-17 16:44:02 +10:00
Rob Harrington
e40ecae681
Removing inline styles for links dropdown
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
