raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

2043 Commits

Author SHA1 Message Date
Grey Baker
468c29b8c1 Use new basic auth stub style 2018-08-22 21:35:56 +01:00
Grey Baker
a747561e77 Switch feature matcher style from to_not have to to have_no 2018-08-22 09:29:48 +01:00
luisramos0
653804d14c Make cookies test more stable 2018-08-20 21:08:09 +01:00
luisramos0
61f69905f8 fixed UX problem in the state selector in customers admin 2018-08-20 20:51:22 +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
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
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
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
Pau Perez
43bf7293bf Merge branch 'master' into 2-0-stable 
* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...
 2018-07-27 10:21:47 +02: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
Kristina Lim
2bba72c5a9 Fix frontend sorting in "Bulk Order Management" 2018-07-23 10:33:40 +10:00
Kristina Lim
822b2c929a Fix frontend sorting in "Customers" index 
The scope for customersCtrl did not have access to the sorting
preferences stored in the nested ColumnsCtrl scope. To address this,
the page has been changed to use a new set of sorting preferences
declared in the customersCtrl scope itself.

Also, these sorting preferences are now stored in an object. This
enables the parent scope to see changes to the sorting preferences which
are done via the nested ColumnsCtrl scope,

The "Bulk Order Management" page is also affected by the same scoping
issue. Once this page is fixed, we can remove remnants of the sorting
preferences initialized in ColumnsCtrl.
 2018-07-23 10:33:39 +10:00
Maikel
12838ba61e Merge pull request #2468 from mkllnk/improve-testing-embedded-pages 
Improve testing embedded pages
 2018-07-23 08:59:11 +10:00
Maikel
add250b30f Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid 
PI: Don't allow save if invalid entries are present
 2018-07-23 08:54:01 +10:00
Hugo Daniel
514fc0a781 Remove dependency to Dash and Jirafe 2018-07-20 13:04:58 +02:00
Maikel Linke
8a3a617870 DRY specs with new EmbeddedPagesHelper 2018-07-19 10:44:43 +10:00
Matt-Yorkley
b37bea35fa Use relative translation keys 2018-07-18 11:43:31 +01:00
Kristina Lim
c16f4203f9 Rename enterprise "Relationships" to "Permissions" 
This only updates en* translations, and does not affect URLs and other
back-end references.
 2018-07-17 16:03:48 +10:00
Matt-Yorkley
8aed78b0e6 Don't allow save if invalid entries are present 2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab PI post-save UI changes 2018-07-15 00:27:21 +01:00
Maikel Linke
599f1a966b Use embedded shops example for tests 2018-07-13 16:36:19 +10:00
Maikel Linke
66980b247a Fix test of opening shops in new windows 
The test case had some hard-coded enterprise name that didn't match
anything. It then confirmed that all found links (none) would open a new
window. So it wasn't confirming anything.
 2018-07-13 15:37:19 +10:00
Maikel Linke
6f737d8d1e Unclutter spec setup 2018-07-13 15:37:19 +10:00
Maikel Linke
ed747ec612 Use embedded groups example for tests 2018-07-13 15:37:19 +10:00