Rob Harrington
cc55f59b00
Update tag_rules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7
Make VO count on hand readonly unless limited stock
2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5
Ensure in UI compatible VO count and on demand
2018-12-05 17:40:28 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Matt-Yorkley
a5407d780c
Include unexpected validation errors
2018-11-21 19:16:07 +00:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Kristina Lim
798a6ed391
Translate more text in OC filters
2018-09-17 10:09:17 +10:00
Maikel
e836ac0234
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
...
Enable setting a customized user guide link in general settings
2018-09-14 15:46:05 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Hugo Daniel
cc43d789e2
Refacto edit method for content controller and enable custom user guide link
2018-09-12 14:51:53 +02:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
Kristina Lim
86f4a118dd
Translate placeholder for order cycle name filter
2018-09-07 17:58:34 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
luisramos0
e573a3fc2b
The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.
2018-08-31 11:23:11 +10:00
Maikel Linke
d1f7828432
Fix pending spec
...
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254
Remove old deactivated code
2018-08-30 14:50:41 +10:00
Kristina Lim
28792fc895
Add tests for adding/updating enterprise images
2018-08-26 03:58:19 +08:00
Matt-Yorkley
2b057a26d5
Add primary_producer to index to reduce queries
2018-08-24 15:51:37 +10:00
Kristina Lim
c14e7ea8d5
Allow bulk update of order cycle name
2018-08-16 21:18:24 +08:00
luisramos0
3b1bd53d3a
Added basic integration with Matomo
...
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
2018-08-10 16:12:58 +10:00
Kristina Lim
6251c72921
Add divider between admin enterprise index actions
2018-08-10 12:17:31 +10:00
Kristina Lim
b91019ad64
Split translation key for enterprise manage button
...
The ".manage" key is still used by the column header for the "Manage"
buttons.
2018-08-10 12:12:26 +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
b736560d63
Inform about inaccurate subscription totals
...
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Maikel Linke
d5fdda1c46
Fix typo translating Enterprises
2018-08-03 12:15:50 +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
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
Kristina Lim
89ac558f37
Fix wrong sort predicates in customer index
2018-07-23 10:33:40 +10:00
Kristina Lim
5179f7fd63
Move logic for toggling by column into SortOptions
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
Kristina Lim
745390dcd5
Wrap rows in customer index with TBODY tag
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
Maikel
1b571e9835
Merge pull request #2379 from Matt-Yorkley/uk/guest_label
...
Add guest label to admin customers index
2018-07-20 08:53:26 +10:00
Maikel
1dbd265b30
Merge pull request #2384 from luisramos0/open_new_tab
...
added directive to make links open in new tab by default in textangul…
2018-07-19 09:17:09 +10:00
Matt-Yorkley
583f16b38d
Add guest label to admin customers index
2018-07-18 22:56:10 +01:00
Matt-Yorkley
5e142205bd
Use relative translation keys
2018-07-18 13:35:23 +01:00
