Transifex-Openfoodnetwork
b71443ccd8
Updating translations for config/locales/ca.yml
2019-09-13 20:45:12 +10:00
Transifex-Openfoodnetwork
8fd3d9e03c
Updating translations for config/locales/es.yml
2019-09-13 20:42:43 +10:00
Transifex-Openfoodnetwork
787727872f
Updating translations for config/locales/ca.yml
2019-09-13 20:42:04 +10:00
Pau Pérez Fabregat
5bf72ae780
Merge pull request #4234 from coopdevs/remove-hidden-integrity-check
...
Remove integrity check for deleted variants in OCs
2019-09-13 11:27:41 +02:00
Pau Pérez Fabregat
290d00f17d
Merge pull request #4232 from coopdevs/remove-guard
...
Remove Guard and Guard-related gems
2019-09-13 11:25:29 +02:00
Pau Perez
3d7bbbbb19
Remove unused Guardfile
2019-09-13 08:25:54 +02:00
luisramos0
3d32987227
Fix taxonomies to represent the endpoints in OFN
2019-09-12 19:52:13 +01:00
luisramos0
902e51e580
Add api/customers endpoints
2019-09-12 19:11:53 +01:00
luisramos0
743cb3b33a
Add update product image endpoint and delete enterprise fees endpoint
2019-09-12 18:02:06 +01:00
luisramos0
74e49787f4
Add the remaining missing enterprises endpoints
2019-09-12 15:16:35 +01:00
luisramos0
afa8f97627
Add post and put on enterprises and fix details in shipments endpoints
2019-09-12 13:42:40 +01:00
luisramos0
6e677fecce
Remove now inexistent endpoints /new
2019-09-12 13:19:43 +01:00
luisramos0
889a3e6d9d
Improve file layout and move Order model to correct place
2019-09-12 13:15:40 +01:00
luisramos0
664be47ac3
Add endpoints for /orders/shipments
2019-09-12 13:08:39 +01:00
Sigmund Petersen
fd77f48aca
Merge pull request #4253 from openfoodfoundation/RachL-patch-1
...
Update Slack invite link
2019-09-12 09:17:37 +02:00
Rachel Arnould
9a31b99de6
Update missing second link
2019-09-11 15:52:44 +02:00
luisramos0
0e4b5ad9ec
Remove now gone orders/{order_number} endpoint and its models, may be readded in the near future but the models may be different as these docs refer to the now gone spree_api order rabl representation
2019-09-11 11:35:01 +01:00
luisramos0
5634f4af18
Move orders endpoints above in the file as they are the most important endpoints
2019-09-11 11:34:57 +01:00
luisramos0
0dede39617
Make list of /products/{product_id}/variants endpoints correct according to current code
2019-09-11 11:15:55 +01:00
Transifex-Openfoodnetwork
d98e302047
Updating translations for config/locales/nb.yml
2019-09-11 19:47:09 +10:00
luisramos0
377b4a3755
Do not add ng-controller if main_ng_ctrl_name is not set
2019-09-11 10:36:19 +01:00
luisramos0
0c809b2911
Remove now unused override app_wrapper
2019-09-11 10:35:39 +01:00
luisramos0
33472014f1
Do not add main_ng_app_name if it is not defined
2019-09-11 10:32:30 +01:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
luisramos0
3d718d9738
Move admin layout body contents to a separate partial
2019-09-11 10:32:29 +01:00
Luis Ramos
500ef901fd
Merge pull request #4164 from luisramos0/little_de_deface
...
Remove some unused deface overrides and move some others to their views
2019-09-11 10:26:56 +01:00
Matt-Yorkley
a15db65e69
Reload tested variant and price objects
2019-09-11 04:32:19 +01:00
Matt-Yorkley
64a501ee20
Don't index new deleted_at column for spree_prices
2019-09-11 04:29:02 +01:00
Matt-Yorkley
95fcff8bb1
Add migration to remove broken variants from open carts
2019-09-11 04:29:00 +01:00
luisramos0
a2e6b84db2
List the actual actions available in the api/products endpoint
2019-09-10 17:22:52 +01:00
luisramos0
d319f97733
Remove now unexisting endpoints zones, states and countries
2019-09-10 12:36:34 +01:00
Luis Ramos
c0bf7e2e75
Merge pull request #4236 from mkllnk/4222-checkout-paypal-error-handling
...
4233 Add missing Spree route for Paypal
2019-09-10 12:24:21 +01:00
Luis Ramos
1d177a164b
Merge pull request #4247 from mkllnk/4243-inventory-pagination
...
4243 Restore old pagination API for inventory products
2019-09-10 11:35:04 +01:00
Rachel Arnould
d846c31db9
Update Slack invite link
...
Updated Slack invite link in README
2019-09-10 09:51:59 +02:00
Maikel Linke
efd01f8c9e
Move new inventory spec to existing variant overrides spec
...
I decided to not share the same data setup with the other parts of the
spec because we don't need as much data and it's slow to create.
2019-09-10 10:05:23 +10:00
luisramos0
fb65c64c68
Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
...
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
Transifex-Openfoodnetwork
b8d8ee4edc
Updating translations for config/locales/en_GB.yml
2019-09-10 05:14:09 +10:00
Luis Ramos
936784404e
Merge pull request #4112 from luisramos0/convert_shipments_rabl
...
Convert spree/api/shipments views from rabl to ams
2019-09-09 18:34:02 +01:00
Matt-Yorkley
11ea852211
Add migration to reset negative stock levels to zero
2019-09-09 17:49:58 +01:00
Matt-Yorkley
4656c35f71
Don't change on_demand variant's stock when updating shipments
2019-09-09 17:49:58 +01:00
Matt-Yorkley
254315b79e
Don't mark on_demand items and shipments as "backordered"
2019-09-09 17:49:56 +01:00
luisramos0
cc7461e692
Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
...
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize
In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
luisramos0
c4d5eec7fd
Covering restart_checkout code with more tests to clarify behaviour with different order.ship_address objects
...
The edge case here is when ship_address is present but empty, on the checkout_controller we are going to move from using an empty ship_address to using a non-empty one. We keep the original case where this spec was testing with a nil order.ship_address
2019-09-09 17:48:04 +01:00
Luis Ramos
2dc85463ce
Merge pull request #4226 from HugsDaniel/4090-missing-translations-order
...
Add missing translations for orders
2019-09-09 15:16:47 +01:00
Matt-Yorkley
aa3bd93ad0
Bump Ruby version to 2.1.9
2019-09-09 12:22:20 +01:00
Maikel Linke
24c8bb95cb
Restore old pagination API for products
...
It's still used by the inventory page. This is an easy fix that I can
deploy without risk. A rewrite of the inventory pagination should
follow.
2019-09-09 14:53:04 +10:00
Maikel Linke
2e361baeaa
Ignore block length cop for feature and scenario
...
They are typically long and that's okay, same with `describe` and `it`.
2019-09-09 14:53:04 +10:00
luisramos0
a98a0bd264
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-08 14:05:49 +01:00
luisramos0
b4de8ef899
Make enterprises/index_spec a bit more resilient
2019-09-08 12:17:36 +01:00
luisramos0
f0586af1c7
Re-organized api/orders resource routes
2019-09-08 12:17:36 +01:00
