raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,662 Commits 20 Branches 451 Tags
a494fb274ea5fdf2d2002eae6ee5fe2a2ebe545b
Commit Graph

1029 Commits

Author SHA1 Message Date
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow 2018-08-03 14:33:35 +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
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
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
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
d5d1eae715 Improve spec description 2018-07-13 09:04:42 +10:00
Maikel Linke
43883d1ab4 Simplify email confirmation directive 
Making better use of Angular features.
Adding a spec for this functionality.
 2018-07-13 09:04:42 +10:00
Maikel Linke
6a58deb436 Add message about unconfirmed email to user form 2018-07-13 09:04:41 +10:00
Maikel Linke
97d1b5d7fe Add spec for creating users 2018-07-13 09:04:40 +10:00
Rob Harrington
c71a5ec0df Update subscription form to use new card validations for Stripe payment method 2018-07-05 19:26:11 +10:00
Maikel
3399eba428 Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel 
Move product bulk edit to product index route
 2018-06-20 17:53:57 +10:00
Rob Harrington
86d7453d26 Ask user to confirm oc date change for open order cycles with subsciptions 2018-06-20 13:06:05 +10:00
Frank West
8324b00999 Renames product bulk edit action to index 
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.

It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
 2018-06-19 17:51:23 +10:00
luisramos0
d1019fcc5e changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed 2018-06-19 10:34:02 +10:00
Maikel Linke
67c2574b0b Show report search instructions 
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
 2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6 Unify report table rendering 
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
 2018-06-18 11:08:58 +10:00
Pau Pérez Fabregat
3283c5158b Merge pull request #1492 from Matt-Yorkley/uk/import2 
Uk/import2
 2018-06-04 09:56:36 +02:00
Rob Harrington
184bf9ce36 Allow super admin users to enable subscriptions for enterprises 2018-05-30 09:42:03 +10:00
Matt-Yorkley
b440d05205 Tidy up unnecessary PI code 2018-05-26 19:34:20 +01:00
Matt-Yorkley
a4a2bc438a Import settings spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
58e9f0266a User guide check 2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a Product Import refactor 2018-05-26 19:34:20 +01:00
Matt-Yorkley
11908f125e Fix flaky spec 2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db Spec adjustments 2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400 PI inventories UX 
Minor tweaks
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
678a2a365d Fix spec date to string issue 2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3 PI human-readable unit fields 
Enhanced unit specs
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4 Product Import v3 with asynchronous processing 
Fixed spec

Quick spec tweak
 2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480 PI inventories additions 2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900 PI inventories and overhaul 2018-05-26 19:34:19 +01:00
Pau Perez
208e3bbadd Ensure non-distributors are listed in dashboard 
We want to show all enterprises in a single list regardless of their
type.
 2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88 Remove enterprises producers tab from dashboard 2018-05-22 10:21:35 +02:00
Maikel Linke
acee5da31b Remove unnecessary whitespace 2018-05-18 11:27:48 +10:00
Maikel Linke
5f9d239f19 Compile Products & Inventory report only on search 2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2 Don't compile xero report data before search 2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0 Don't compile user-enterprises report before search 2018-05-18 11:27:47 +10:00
Maikel Linke
28d66ad3e0 Activate dormant specs 
It looks like a typo prevented a bunch of specs from being run.
 2018-05-18 11:27:47 +10:00
Maikel Linke
5aef7031d2 Convert specs to RSpec 3.7.0 syntax with Transpec 
This conversion is done by Transpec 3.3.0 with the following command:
    transpec spec/features/admin/reports_spec.rb

* 40 conversions
    from: obj.should
      to: expect(obj).to

* 10 conversions
    from: == expected
      to: eq(expected)

* 3 conversions
    from: obj.should_not
      to: expect(obj).not_to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-05-18 11:27:46 +10:00
Maikel Linke
7c68ac9d0c Wait for dialog to appear before using it 
Travis was failing a few times. This should make the spec more robust.
 2018-05-15 15:00:18 +10:00
Daniel Dominguez
9d9a974295 Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated. 
- Change FactoryGirl to FactoryBot everywhere on code.
 2018-05-04 11:52:08 -03:00
Matt-Yorkley
cd4268d219 Add manager dropdown UX 2018-04-23 12:55:49 +10:00
Rob Harrington
c77a01815c Copy datepicker directive to utils module 
Ensures that datepicker is available for subscriptions
 2018-04-23 11:05:22 +10:00
Pau Pérez Fabregat
ac37b0fc7e Merge pull request #2221 from Matt-Yorkley/uk/bep_images_ux 
Close modal when image updated successfully
 2018-04-17 18:05:20 +02:00
Pau Pérez Fabregat
1abfe2ab8c Merge pull request #2199 from coopdevs/auto-correct-cops 
Auto correct cops
 2018-04-16 14:58:28 +02:00