Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 1 year ago
parent
commit
b4da6dcf01
2 changed files with 31 additions and 17 deletions
  1. +29
    -15
      Repository/Order/OrderShopStore.php
  2. +2
    -2
      Resources/translations/admin.fr.yaml

+ 29
- 15
Repository/Order/OrderShopStore.php View File

); );
} }


// getOrderShopsOfWeekByUser
//getByCurrentCycleAndUser
public function getByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
{
return $this->getByCurrentDistribution(
array_merge(
[
'user' => $user,
'excludeComplementaryOrderShops' => true
],
$params
),
$query
);
}


//public $countOrderShopsOfWeek = null; //public $countOrderShopsOfWeek = null;
// public function countByCurrentCycle(bool $excludeComplementaryOrderShops = true, $query = null) // public function countByCurrentCycle(bool $excludeComplementaryOrderShops = true, $query = null)
return $this->countOrderShopsOfWeek;*/ return $this->countOrderShopsOfWeek;*/
} }


public function getByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
{
return $this->getByCurrentDistribution(
array_merge(
[
'user' => $user,
'excludeComplementaryOrderShops' => true
],
$params
),
$query
);
}

public function countValidByCurrentDistributionAndUser(UserInterface $user = null, array $params = [], $query = null)
{
return $this->countByCurrentDistribution(
array_merge(
[
'isValid' => true,
'user' => $user,
'excludeComplementaryOrderShops' => true
],
$params
),
$query
);
}

// getNextWeekId // getNextWeekId
public function getNextCycleId(Distribution $distribution, $query = null): int public function getNextCycleId(Distribution $distribution, $query = null): int
{ {

+ 2
- 2
Resources/translations/admin.fr.yaml View File

label: Règle de taxe label: Règle de taxe
label_plurial: Règles de taxes label_plurial: Règles de taxes
UserMerchant: UserMerchant:
label: Utilisateur avec compte prépayé actif
label_plurial: Utilisateurs avec comptes prépayés actifs
label: Utilisateur
label_plurial: Utilisateurs
fields: fields:
user: user:
email: Email email: Email

Loading…
Cancel
Save