raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 17 Branches 453 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

6988 Commits

Author SHA1 Message Date
luisramos0
3c964933b1 Remove stub of a deleted method #deadcode 2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620 Remove unused spree checkout and spree cart routes 2019-06-18 10:49:19 +01:00
luisramos0
ba91abd20e Adapt exchanges.with_any_variant scope to rails 4 2019-06-18 10:40:49 +01:00
luisramos0
0d07bf2a3b Adapt enterprise.distributing_products scope to rails 4 2019-06-18 10:40:49 +01:00
Jon Leighton
fcff302d55 Bring back ‘Shop for X products at:’ title 
Fixes #2112

It looks like this bug was accidentally introduced during a refactor in
e5ca494db8. The `bo-html` attribute was
replaced with `ng-html`, but it appears that it should actually have
used `ng-bind-html`
(https://docs.angularjs.org/api/ng/directive/ngBindHtml) because the
former is not a valid AngularJS directive.

It was also necessary to bubble up the `.cta-container` class in order to
get the appropriate styling on the title.
 2019-06-17 15:43:15 +10:00
luisramos0
ccc7a43a06 Bypass validation of shipping methods zone on checkout 2019-06-15 21:11:51 +01:00
Luis Ramos
b1d4461c77 Merge pull request #3936 from luisramos0/factories_refactor 
Extract factories to separate files and fix rubocop issues
 2019-06-14 22:28:55 +01:00
Pau Pérez Fabregat
45c77196b3 Merge pull request #3935 from mkllnk/update-rubocop-style 
Update rubocop style
 2019-06-14 19:52:22 +02:00
luisramos0
13d41dc1aa Remove duplicate modify entry in factories 2019-06-14 13:59:24 +01:00
luisramos0
3259db69f0 Remove unnecessary code, this code as been accepted in spree code base and included in spree v1.2 2019-06-14 13:43:30 +01:00
luisramos0
6efb71d903 Fix more rubocop issues in spec/factories 2019-06-14 13:42:27 +01:00
Luis Ramos
91401446a5 Merge pull request #3915 from mkllnk/3844-permalink-conflicts 
Consider deleted products when creating permalinks
 2019-06-14 13:20:35 +01:00
luisramos0
59593c824a Fix rubocop issues in different factories 2019-06-14 13:10:53 +01:00
luisramos0
79cf03b124 Fix rubocop issues in spec/factories 2019-06-14 13:01:08 +01:00
luisramos0
a6b3c26bbe Extract users factories to separate file 2019-06-14 12:50:26 +01:00
luisramos0
8345765ada Extract tag rules factories to separate file 2019-06-14 12:49:17 +01:00
luisramos0
03fb33ba86 Extract variant factory modify to separate file 2019-06-14 12:48:04 +01:00
luisramos0
2c8ce6e4e5 Extract products factories to separate file 2019-06-14 12:45:55 +01:00
luisramos0
3e10c703bf Extract shipments factories to separate file 2019-06-14 12:43:07 +01:00
luisramos0
42f8b2efed Fix static file path in order_cycle_factory 2019-06-14 12:30:36 +01:00
luisramos0
bd493c392a Extract shipping_methods factories to separate file 2019-06-14 12:25:10 +01:00
luisramos0
dc701f55b3 Extract calculators factories to separate file 2019-06-14 12:23:32 +01:00
luisramos0
06e3328ce2 Extract orders factories to separate file 2019-06-14 12:17:24 +01:00
luisramos0
91fcb7c7c4 Extract enterprises factories to separate file 2019-06-14 12:12:45 +01:00
luisramos0
42f2e78b10 Extract subscriptions factories to separate file 2019-06-14 12:10:54 +01:00
luisramos0
0501859c23 Extract order_cycle factories to separate file 2019-06-14 12:10:27 +01:00
luisramos0
a7c970054c Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails 2019-06-14 10:20:28 +01:00
luisramos0
c97925aa4a Improve message in private shopfront when closed or when user is not logged in 2019-06-14 10:13:33 +01:00
Maikel Linke
ac79e44d9a Fix current rubocop violations 2019-06-14 11:40:09 +10:00
luisramos0
1db220e1e0 Remove unnecessary referer setting from products controller spec 2019-06-13 17:22:09 +01:00
Luis Ramos
e15ccdbd74 Merge pull request #3840 from mkllnk/3727-default-credit-cards 
Make only reusable credit cards the default card
 2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630 Merge pull request #3886 from luisramos0/fees_translations 
Make a few more things translatable in the Enterprise Fees management page
 2019-06-13 14:12:16 +01:00
Luis Ramos
09a5426095 Merge pull request #3880 from kristinalim/fix/3792-optimize_order_cycle_variant_updates 
3792 Optimize saving Order Cycle changes
 2019-06-13 12:33:22 +01:00
Luis Ramos
bb7a2d7a5e Merge pull request #3252 from mllocs/fix/navbar-right-items-styles 
Top navbar redesign and cleanup
 2019-06-13 12:04:20 +01:00
Matt-Yorkley
785595a951 Reduce initial queries on shop page by ~95% 2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b Only query visible enterprises 2019-06-12 09:47:01 +01:00
Matt-Yorkley
4155b17633 Remove tests that reference removed code 2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6 Fix groups index page 2019-06-12 09:47:01 +01:00
Matt-Yorkley
aca1f92060 Adapt specs to new loading methods 2019-06-12 09:47:01 +01:00
Matt-Yorkley
ae8f1a92e8 Remove "profiles" from /shops 2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6 List only current taxons for active enterprises 2019-06-12 09:47:01 +01:00
Matt-Yorkley
e329b4bfb0 Improve queries for serializers 2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat
fd95ae7e41 Merge pull request #3847 from Matt-Yorkley/api_access 
Allow unauthenticated access to OFN API endpoints
 2019-06-12 09:45:11 +02:00
luisramos0
f23094df09 Fix file name of js unit test files in admin/order_cycles/controllers 2019-06-11 21:28:55 +01:00
luisramos0
6cf705ea55 In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id. 2019-06-11 21:28:52 +01:00
Maikel Linke
5c72c35060 Use better credit card factory for subs specs 
The specs for subscriptions were creating simple one-time-use credit
cards. They should not be used for subscriptions. After this was fixed
in previous commits, these integration tests failed. Now we use a new
factory that mimics stored credit cards that can be used for
subscriptions.
 2019-06-11 18:01:41 +01:00
Maikel Linke
b3b8cb778f Make only reusable credit cards the default card 
https://github.com/openfoodfoundation/openfoodnetwork/issues/3727

When a user didn't have a default credit card and then checked out with
a credit card it became the default even when the user didn't intend to
store it. That lead to subscriptions trying to charge a one-time card
which fails.
 2019-06-11 18:01:41 +01:00
Maikel Linke
a10bb5acbd Consider deleted products when creating permalinks 
https://github.com/openfoodfoundation/openfoodnetwork/issues/3844

Spree's implementation and our implementation to create a unique
permalink failed to notice conflicts with soft-deleted products. This
patch looks at deleted products as well.
 2019-06-11 18:20:41 +10:00
Kristina Lim
70614de955 Require product import rows to match unit of preceding rows 2019-06-10 04:20:03 +08:00
Kristina Lim
73b388da87 Simplify product import all_entries method 2019-06-10 04:20:03 +08:00