Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Order creation for stores #4778

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3d3fc84
changed: set price to 0 if pricing rules are not configured
vladimir-8 Nov 29, 2024
7192c51
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Nov 29, 2024
a5adbd8
add: create/modify pricing rule page title
vladimir-8 Nov 29, 2024
5410a1f
deprecated and removed 'create orders' setting on Stores
vladimir-8 Nov 30, 2024
659ed24
define variables
vladimir-8 Nov 30, 2024
db58fde
WIP: allow an admin to set the price manually on any delivery order
vladimir-8 Nov 30, 2024
7700548
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 2, 2024
9cb75e1
fix tests
vladimir-8 Dec 2, 2024
fdd7f69
renamed: OrderFactory: createForDeliveryAndPrice
vladimir-8 Dec 3, 2024
527a62d
use PricingManager to create orders from the web UI
vladimir-8 Dec 3, 2024
6f0e6b2
changed: create an incident when the price can not be calculated for …
vladimir-8 Dec 3, 2024
a8a1762
handle invalid pricing for recurrence rules
vladimir-8 Dec 3, 2024
cbf4383
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 3, 2024
a8245d7
split tests: one test per file
vladimir-8 Dec 3, 2024
44b5817
fix: test (store should not to be able to create an order; and an adm…
vladimir-8 Dec 3, 2024
c588716
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 3, 2024
bbfc54d
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 6, 2024
e57615b
fixed: API tests
vladimir-8 Dec 6, 2024
9c1474e
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 6, 2024
fbe1b85
added: new failure reason
vladimir-8 Dec 6, 2024
95c403c
fixed: create incident if a price can not be calculated for an order …
vladimir-8 Dec 7, 2024
db53963
fixed: create an incident if a price can not be calculated for an ord…
vladimir-8 Dec 7, 2024
a7f704d
fix: test
vladimir-8 Dec 7, 2024
9584a0e
added: test delivery order creation via an API by an admin and a stor…
vladimir-8 Dec 7, 2024
6a5c85f
changed: create an incident unless throw an exception is set explicitly
vladimir-8 Dec 7, 2024
9f55f96
re-format
vladimir-8 Dec 7, 2024
077c095
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 7, 2024
a85c5c5
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 9, 2024
a080d90
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 10, 2024
2dcb0fe
fixed: override price for existing Delivery Orders
vladimir-8 Dec 11, 2024
f245715
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 12, 2024
7da05e3
fix PHPStan errors
vladimir-8 Dec 13, 2024
e1917f1
fix PHPStan errors
vladimir-8 Dec 13, 2024
f344118
fix PHPStan errors
vladimir-8 Dec 14, 2024
fbcef6f
added: test that an admin can change the order price
vladimir-8 Dec 14, 2024
0ec6a08
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 14, 2024
52991ef
moved deliveryAction back into DeliveryTrait
vladimir-8 Dec 14, 2024
7032c73
removed duplicate code
vladimir-8 Dec 14, 2024
8362559
fixed: move deliveryAction back into DeliveryTrait
vladimir-8 Dec 14, 2024
e1a7d28
simplify conditionals
vladimir-8 Dec 14, 2024
fa15752
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 14, 2024
0b1bcee
fix: PHPStan: Error: Call to an undefined method AppBundle\Controller…
vladimir-8 Dec 14, 2024
3bc680d
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 14, 2024
2ebab70
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 16, 2024
c85e680
eliminate some code duplication
vladimir-8 Dec 16, 2024
3fbb356
fixed: duplicate command
vladimir-8 Dec 16, 2024
0ec4032
use saved addresses in some tests
vladimir-8 Dec 16, 2024
3e34745
fixed: allow to convert a stand-alone delivery into an order
vladimir-8 Dec 16, 2024
1e26b83
fixed: put back the previous address
vladimir-8 Dec 16, 2024
5e0a380
updated localisation
vladimir-8 Dec 16, 2024
895f4ec
added: translations
vladimir-8 Dec 16, 2024
bba193e
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 20, 2024
3d84176
create an incident for delivery orders added by ApiApp
vladimir-8 Dec 23, 2024
c5107ff
simplify `getDeliveryPrice` calls
vladimir-8 Dec 23, 2024
3a3a762
unify food tech vs non food tech deliveries check
vladimir-8 Dec 23, 2024
846bc77
refactor: check `isStoreDeliveryOrder`
vladimir-8 Dec 23, 2024
58d65f1
Merge branch 'master' into feature/default-pricing-rule
vladimir-8 Dec 24, 2024
03449a2
fix test
vladimir-8 Dec 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added: translations
  • Loading branch information
vladimir-8 committed Dec 16, 2024
commit 895f4ec33ca5d3ffeccea0fd95c330a88473c11d
7 changes: 7 additions & 0 deletions translations/messages.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@ form.store_type.create_orders.label: Crear pedidos
form.delivery.vehicle.VEHICLE_BIKE: Bicicleta
form.delivery.vehicle.VEHICLE_CARGO_BIKE: Bicicleta de carga
form.store_type.pricing_rule_set.placeholder: Escoge una tarifa
form.store_type.pricing_rule_set.warning: Sin tarificación,
el precio de entrega no se puede calcular ni rastrear para la facturación.
Además, la contribución basada en el monto del pedido no estará disponible.
form.store_type.pricing_rule_set.warning.list: La tarificación no está configurada
form.store_type.setAsDefault.label: Establecer como dirección predeterminada
form.store_type.defaultAddress.label: Dirección predeterminada
form.delivery.vehicle.placeholder: Escoge un vehículo
Expand All @@ -314,6 +318,8 @@ form.delivery.duration.label: Duración
form.delivery.store.label: Tienda
form.delivery.store.placeholder: Busca una tienda…
form.delivery.price.label: Precio
form.delivery.price.missing: Contáctenos para más detalles
form.delivery.price.missing.incident: "Pedido #%number%: No se pudo calcular el precio de entrega. Por favor, ingréselo manualmente y verifique la tarificación."
form.order.accept.label: Aceptar
form.order.accept.help: Una vez que haya aceptado el pedido, el cliente será notificado
por correo electrónico.
Expand Down Expand Up @@ -552,6 +558,7 @@ recurrence_rules.table.repeat: Repetir
recurrence_rules.table.generate_orders: Generar tareas/pedidos
recurrence_rules.table.created_at: Regla creada
recurrence_rule.legacy: Utilice el panel de despacho para eliminar esta regla
recurrence_rule.price.missing: No se pudo calcular el precio de entrega. Por favor, verifique la tarificación.
meta.title: Plataforma de logística para cooperativas
admin.settings.missing_mandatory_settings: "Algunos ajustes obligatorios no han sido\
\ configurados.\nVes a la <a href=\"%settings_url%\">página de ajustes</a> para\
Expand Down
7 changes: 7 additions & 0 deletions translations/messages.fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,10 @@ checkout.breadcrumb.payment: Paiement
checkout.breadcrumb.confirm: Confirmation
form.geojson_upload.file: Fichier
form.store_type.pricing_rule_set.label: Tarification
form.store_type.pricing_rule_set.warning: Sans tarification,
le prix de livraison ne peut pas être calculé et suivi pour la facturation.
De plus, la contribution basée sur le montant de la commande ne sera pas disponible.
form.store_type.pricing_rule_set.warning.list: La tarification n'est pas configurée
form.store_type.prefill_pickup_address.label: Remplir automatiquement l'adresse de
retrait
form.store_type.create_orders.label: Créer des commandes
Expand Down Expand Up @@ -389,6 +393,8 @@ form.delivery.store.label: Magasin
form.delivery.store.placeholder: Rechercher un magasin…
form.delivery.confirm.label: Confirmer
form.delivery.price.label: Prix
form.delivery.price.missing: Contactez-nous pour plus de détails
form.delivery.price.missing.incident: "Commande #%number%: Le prix de livraison n'a pas pu être calculé. Veuillez l'entrer manuellement et vérifier la tarification."
form.delivery.to_be_confirmed.warning: Vous devez confirmer la commande
form.delivery.has_order.info: Cette livraison est liée à une commande
form.delivery.view_order: Voir la commande
Expand Down Expand Up @@ -706,6 +712,7 @@ recurrence_rules.table.repeat: Répéter
recurrence_rules.table.generate_orders: Générer des tâches/commandes automatiquement
recurrence_rules.table.created_at: Règle créée
recurrence_rule.legacy: Supprimer cette règle dans le panneau de dispatch
recurrence_rule.price.missing: Le prix de livraison n'a pas pu être calculé. Veuillez vérifier la tarification.
suggest.submitted.title: Merci de nous avoir suggéré ce restaurant !
meta.title: Plateforme de livraison pour les sociétés coopératives
admin.settings.missing_mandatory_settings: "Des paramètres obligatoires sont manquants.\n\
Expand Down
Loading