Matt-Yorkley
2a83ad8689
Improve UX and consistency in orders pagination and page changing
2019-09-02 11:59:13 +01:00
Matt-Yorkley
0623bab084
Don't respond to a successful update by querying 500 arbitrary products
2019-09-02 11:56:00 +01:00
Matt-Yorkley
7dccb5ba90
Changing per_page should also reset the query
2019-09-02 11:56:00 +01:00
Matt-Yorkley
5cb5967977
Fix cleared filters submitting "0" as value in queries
2019-09-02 11:56:00 +01:00
Matt-Yorkley
1822fd97a6
Tidy up filters
2019-09-02 11:54:28 +01:00
Matt-Yorkley
a63994440d
Add pagination to UI
2019-09-02 11:54:28 +01:00
Matt-Yorkley
f6d0de1454
Improve pagination data in bulk products
2019-09-02 11:54:28 +01:00
Matt-Yorkley
9b0e27a9d1
Add new ProductResource
2019-09-02 11:46:42 +01:00
Matt-Yorkley
415d88f302
Fix indentation in bulk product controller
2019-09-02 11:46:42 +01:00
Luis Ramos
f2d25748b1
Merge pull request #4078 from HugsDaniel/defacepocalypse-variants
...
[Defacepocalypse] De-deface variants
2019-08-25 22:51:15 +01:00
Hugo Daniel
1217811402
Refactor and remove empty lines
2019-08-13 11:03:04 +02:00
Hugo Daniel
bf2c1a0c1d
Add ng directive for setting on demand
2019-08-09 14:42:39 +02:00
Pau Pérez Fabregat
64d21969f0
Merge pull request #4064 from luisramos0/convert_search_Rabl
...
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
Luis Ramos
340b92e580
Merge pull request #3700 from luisramos0/2-0-without-auth-devise
...
Remove dependency to spree_auth_devise
2019-07-26 10:57:38 +01:00
Luis Ramos
55f26f0a3d
Merge pull request #4043 from luisramos0/bring_shipment
...
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
2019-07-24 21:59:47 +01:00
luisramos0
7e6259da31
Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
...
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
2019-07-23 21:37:45 +01:00
luisramos0
02c573f146
Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button
2019-07-15 17:11:41 +01:00
luisramos0
9e2e460ac5
Add date format to moment date conversion. This conversion was not working on firefox
2019-07-12 12:01:18 +01:00
Luis Ramos
23b6267e30
Merge pull request #3916 from luisramos0/schedules_of_coordinator
...
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
luisramos0
7c0087cb30
Remove reference to empty spree_auth css and js files from spree_auth_devise
2019-07-06 00:02:40 +01:00
Luis Ramos
2b593a59f5
Merge pull request #3900 from luisramos0/subs_trans
...
Missing translations in Subscriptions
2019-06-13 18:51:20 +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
luisramos0
cfcf73b6a1
Make save and saving messages translatable in subscriptions items panel
2019-06-04 20:59:45 +01:00
luisramos0
5024da4123
Make tag rules type descriptions in the management page translatable
2019-05-30 20:39:58 +01:00
Luis Ramos
4a321f200f
Merge pull request #3783 from kristinalim/fix/3782-missing_translation
...
3782 Fix missing translation in subscription update modal
2019-05-23 18:45:20 +01:00
Luis Ramos
f844ff275b
Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757
...
added buttons to form and updated sanitizer to allow extra formatting
2019-05-10 10:48:55 +01:00
Luis Ramos
19881927e3
Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub
...
Add review & edit sub keys
2019-05-09 16:04:38 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
Luis Ramos
6658f85f59
Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation
...
3292 link popup text translation
2019-05-07 21:11:31 +01:00
Kristina Lim
c3d4288692
Fix translation for closed/closes in subscription update modal
2019-05-07 14:52:03 +08:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
luisramos0
d7e706e6e7
Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code
2019-04-29 13:40:52 +01:00
jazzdragon
7a27973ae3
Add translation and references in taTranslations (not working in alert)
2019-04-27 19:22:15 -07:00
jazzdragon
f6c0071554
Add reference comment
2019-04-27 17:01:07 -07:00
jazzdragon
35de9077da
Add config for taTranslations (no functional change)
2019-04-27 16:57:02 -07:00
luisramos0
9662323261
Move a group of translations related to schedules to the js translations namespace
2019-04-15 17:42:45 +01:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
Maikel
74aea76c4c
Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
...
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
c0c14b16b6
Remove dynamic monthly pricing description that would come from the deleted business model configurations
2019-03-20 11:19:04 +00:00
Maikel Linke
d129665d43
Wait for orders being loaded in bulk order manage
...
The bulk order management page tried to wait for orders being loaded.
But instead of receiving a request object with an a promise to wait for
the page received a simple array without promise. As a result, the page
didn't wait for orders being loaded.
When loading of orders took longer than loading of line items they or at
least not all of them were enriched with distributors and order cycles
and the line items were missing some orders. That lead to random spec
failures.
2019-03-13 10:37:24 +11:00
luisramos0
7c39c45f79
Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code
2019-03-12 19:42:08 +00:00
Maikel Linke
7270a9e8e8
DRY date calculation in BOM js
...
This also minimises the risk of values changing in the meantime.
2019-03-12 18:59:14 +11:00
Maikel Linke
af9e80e55d
Load data after all callbacks are installed
2019-03-12 09:46:27 +11:00
Maikel Linke
4574a770d3
Synchronise dereferencing and initilising
...
This seems to make the spec 4 times more reliable. Still failing from
time to time.
2019-03-08 17:36:25 +11:00
luisramos0
2470830ec8
Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui
2019-03-06 11:28:50 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
