Browse Source

[Backend] Export pesées : gestion véhicules multiples et produits

feature/export_comptable
Guillaume 4 years ago
parent
commit
76ffc38939
3 changed files with 15 additions and 3 deletions
  1. +11
    -0
      ShopBundle/Model/Product.php
  2. +2
    -2
      ShopBundle/Repository/OrderShopRepository.php
  3. +2
    -1
      ShopBundle/Resources/translations/lcshop.fr.yaml

+ 11
- 0
ShopBundle/Model/Product.php View File

$this->status = 1; $this->status = 1;
} }


public function __toString()
{
$title = $this->getProductFamily()->getTitle() ;

if($this->getTitle() && strlen($this->getTitle())) {
$title .= ' - '. $this->getTitle() ;
}

return $title ;
}

public function getBuyingPriceInherited() public function getBuyingPriceInherited()
{ {
if ($this->getBuyingPrice()) { if ($this->getBuyingPrice()) {

+ 2
- 2
ShopBundle/Repository/OrderShopRepository.php View File

$query->andWhere('e.deliveryAddress = :address OR e.invoiceAddress = :address')->setParameter('address', $params['address']); $query->andWhere('e.deliveryAddress = :address OR e.invoiceAddress = :address')->setParameter('address', $params['address']);
} }


if(isset($params['weekDeliveryTruck'])) {
$query->andWhere('e.weekDeliveryTruck = :weekDeliveryTruck')->setParameter('weekDeliveryTruck', $params['weekDeliveryTruck']);
if(isset($params['weekDeliveryTrucks'])) {
$query->andWhere('e.weekDeliveryTruck IN (:weekDeliveryTrucks)')->setParameter('weekDeliveryTrucks', $params['weekDeliveryTrucks']);
} }


if(isset($params['estimatedDeliveryDateTime'])) { if(isset($params['estimatedDeliveryDateTime'])) {

+ 2
- 1
ShopBundle/Resources/translations/lcshop.fr.yaml View File

metaDescription: Meta description metaDescription: Meta description
users: Utilisateurs users: Utilisateurs
total: Total total: Total
products: Produits


PointSale: PointSale:
code: Code code: Code
quantityProduct: Quantité (en rapport à l'unité) quantityProduct: Quantité (en rapport à l'unité)
unit: Unité unit: Unité
OrderShop: OrderShop:
deliveryTruck: Véhicule de livraison
deliveryTrucks: Véhicules de livraison
createdAt: Date de création createdAt: Date de création
updatedAt: Date de modification updatedAt: Date de modification
save: Sauvegarder save: Sauvegarder

Loading…
Cancel
Save