raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,760 Commits 18 Branches 453 Tags
c39ac26f5749ff9c19df41270e35cfa3695e03f8
Commit Graph

4056 Commits

Author SHA1 Message Date
Matt-Yorkley
666fbf53bf Validate enterprise.is_primary_producer? 2018-08-24 15:51:37 +10:00
Maikel
a37931afda Merge pull request #2542 from luisramos0/add_to_cart 
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
 2018-08-24 14:43:33 +10:00
Maikel
bf55190136 Merge pull request #2546 from Matt-Yorkley/pi/sku_validation 
Remove empty SKU values if empty
 2018-08-24 14:32:00 +10:00
Maikel
871e423e12 Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name 
Make OC name editable from the OC index
 2018-08-24 11:38:31 +10:00
Maikel
c4c4547338 Merge pull request #2572 from greysteil/bump-webmock 
Bump webmock
 2018-08-24 08:49:11 +10:00
luisramos0
910297572e Removed unnecessary currency from CartService constructor, using order.currency instead 2018-08-23 12:40:18 +01:00
luisramos0
ec069b1e3e Converted specs to latest rspec syntax 2018-08-23 12:39:58 +01:00
luisramos0
05bfc098ff /controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator. 2018-08-23 12:39:55 +01:00
luisramos0
6caa361354 Moved Spree::OrderController.populate to new CartController. 
This was done to make order populate independent of Spree::OrdersController
 2018-08-23 12:37:52 +01:00
Maikel
0312bf93dd Merge pull request #2556 from luisramos0/cookies_failing_tests 
Make cookies tests more stable
 2018-08-23 13:29:02 +10:00
Maikel Linke
00b8b0a36c Sleep to avoid race conditions in cookie spec 
We tried a lot to avoid these sleep commands, but nothing worked. So
it's better to have reliable specs than fast specs.
 2018-08-23 13:13:05 +10:00
Maikel
92e9392bc5 Merge pull request #2561 from mkllnk/2233-enable-embedded-shopping-spec 
Enable embedded shopping spec
 2018-08-23 09:23:12 +10:00
Grey Baker
468c29b8c1 Use new basic auth stub style 2018-08-22 21:35:56 +01:00
Maikel
4417a8f156 Merge pull request #2539 from luisramos0/delete_dead_cart 
removed Cart route, controller, model and specs: dead code
 2018-08-22 17:35:58 +10:00
luisramos0
653804d14c Make cookies test more stable 2018-08-20 21:08:09 +01:00
Maikel Linke
7dccbb5213 Enable embedded shopping spec 
It was disabled in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2232, because
it was very unreliable. But it seems stable again since
https://github.com/openfoodfoundation/openfoodnetwork/pull/2468.
 2018-08-17 17:00:15 +10:00
Matt-Yorkley
28b1fc076a Remove empty SKU values if empty 2018-08-16 14:29:50 +01:00
Kristina Lim
c14e7ea8d5 Allow bulk update of order cycle name 2018-08-16 21:18:24 +08:00
luisramos0
ccd5147b11 Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration 2018-08-14 10:01:48 +10:00
luisramos0
bff5581a42 Added functional tests for cookies related features: cookies policy page, cookies banner and privacy policy link 2018-08-14 10:01:48 +10:00
luisramos0
0b9061df28 removed Cart route, controller, model and specs: dead code 2018-08-11 22:17:12 +01:00
Kristina Lim
17978f58c7 Rename edit link in admin enterprise index 
Change "Edit Profile" link to "Settings".
 2018-08-10 12:17:31 +10:00
Kristina Lim
0b4fcf8a14 Change enterprise "Manage" button to "Settings" 2018-08-10 12:17:30 +10:00
Maikel
f93ed0de85 Merge pull request #2519 from mkllnk/more-efficient-login-in-specs 
More efficient login in specs
 2018-08-09 10:05:54 +10:00
Maikel
03468efa7e Merge pull request #2346 from oeoeaio/subs-totals 
Subs: totals in backend are consistent and include fee breakdown
 2018-08-07 18:17:13 +10:00
Maikel Linke
9aff9fbce2 Remove empty spec 2018-08-07 16:01:38 +10:00
Maikel Linke
b628ead525 Speed up shipping methods spec 2018-08-07 16:01:38 +10:00
Maikel Linke
54552f2be7 Speed up admin schedules spec 2018-08-07 16:01:37 +10:00
Maikel Linke
819a173167 Speed up reports spec 2018-08-07 16:01:37 +10:00
Maikel Linke
aa677a117b Speed up admin products spec 2018-08-07 16:01:37 +10:00
Maikel Linke
eb550505ae Speed up admin payment method spec 2018-08-07 16:01:37 +10:00
Maikel Linke
9023b16395 Speed up admin orders spec 
From 80s to 74s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
71a381e48e Speed up order cycles spec 
From 68 to 63 seconds.
 2018-08-07 16:01:37 +10:00
Maikel Linke
f4cd5a7e4b Speed up admin enterprise spec 
From 40s to 36s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
121bc51feb Speed up admin enterprises spec 
From 6.5s to 5.3s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
f0da823445 Speed up enterprise user spec 
From 1.9s to 1.7s.
 2018-08-07 12:41:07 +10:00
Maikel Linke
e4ebeb8a29 Remove dead spec code 
The code has been inactive since 2015 and was probably obsolete anyway.
 2018-08-07 12:37:49 +10:00
Maikel Linke
0b39054954 Speed up relationships spec 
From 18s to 12s: 33% speed up
 2018-08-07 12:33:26 +10:00
Maikel Linke
126f312c6b Make spec more robust not relying on order 
Enterprises can be in different order. Using `with_options` doesn't
care about the order.
 2018-08-07 12:30:59 +10:00
Maikel Linke
edb32218b0 Use quick login to speed up product edit spec 
From 48s to 44s: 8% speed up
 2018-08-07 12:11:15 +10:00
Maikel Linke
0edf393c12 Use quick login to speed up spec 
We don't need to visit the admin dashboard before each spec.
On my machine:

  54 seconds before
  47 seconds after
  speed up by 13%
 2018-08-07 10:56:42 +10:00
Maikel Linke
30fad228c5 Remove code duplication in spec helper 2018-08-07 09:24:31 +10:00
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow 2018-08-03 14:33:35 +10:00
Rob Harrington
cead905d05 Use estimated subscription total for proxy orders if order has not been initialized 2018-08-03 12:14:25 +10:00
Rob Harrington
fb93351386 Show fee breakdown in line items panel if present 2018-08-03 12:14:25 +10:00
Maikel
02331221ef Merge pull request #2471 from Matt-Yorkley/pi/post_save 
PI: post-save UI changes
 2018-07-26 11:26:51 +10:00
Maikel Linke
2ceb969925 Style recently merged code 
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
 2018-07-26 10:52:56 +10:00
Maikel
ffd3d28889 Merge pull request #2474 from Matt-Yorkley/pi/import_options 
PI: import options UI
 2018-07-24 10:34:14 +10:00
Matt-Yorkley
67767f86eb Change import and reset logic to work with first page 2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b Move options to first page 2018-07-23 01:46:32 +01:00