Add PaymentGateway to VariableSymbolInterface::getNew()

- PaymentGateway can be used by generator of variable symbol `getNew()` to generate different variable symbol (transaction ID) series for different payment gateways - Payment gateway is always provided when new payment is added with `PaymentsRepository::add()`. - Argument is not optional but can be `null` (caller is forcing generator to work without gateway). Reason for this is admin `PaymentFormFactory` calling API `payments/variable-symbol` which doesn't work with gateway yet. Needs refactoring -> remp/crm#1440 remp/crm#1439
remp2020 · Sep 1, 2020 · a900396 · a900396
1 parent bd81971
commit a900396
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/api/VariableSymbolApiHandler.php b/src/api/VariableSymbolApiHandler.php
@@ -29,7 +29,7 @@ public function params()
  */
  public function handle(ApiAuthorizationInterface $authorization)
  {
- $response = new JsonResponse(['status' => 'ok', 'variable_symbol' => $this->variableSymbol->getNew()]);
+ $response = new JsonResponse(['status' => 'ok', 'variable_symbol' => $this->variableSymbol->getNew(null)]);
  $response->setHttpCode(Response::S200_OK);
 
  return $response;

diff --git a/src/model/Repositories/PaymentsRepository.php b/src/model/Repositories/PaymentsRepository.php
@@ -110,7 +110,7 @@ final public function add(
  'status' => self::STATUS_FORM,
  'created_at' => new DateTime(),
  'modified_at' => new DateTime(),
- 'variable_symbol' => $variableSymbol ? $variableSymbol : $this->variableSymbol->getNew(),
+ 'variable_symbol' => $variableSymbol ? $variableSymbol : $this->variableSymbol->getNew($paymentGateway),
  'ip' => Request::getIp(),
  'user_agent' => Request::getUserAgent(),
  'referer' => $referer,

diff --git a/src/model/Repositories/VariableSymbol.php b/src/model/Repositories/VariableSymbol.php
@@ -4,12 +4,13 @@
 
 use Crm\ApplicationModule\Repository;
 use Crm\PaymentsModule\VariableSymbolInterface;
+use Nette\Database\Table\ActiveRow;
 
 class VariableSymbol extends Repository implements VariableSymbolInterface
 {
  protected $tableName = 'variable_symbols';
 
- public function getNew(): string
+ public function getNew(?ActiveRow $paymentGateway): string
  {
  do {
  $variableSymbol = $this->generateRandom();

diff --git a/src/model/VariableSymbolInterface.php b/src/model/VariableSymbolInterface.php
@@ -2,7 +2,9 @@
 
 namespace Crm\PaymentsModule;
 
+use Nette\Database\Table\ActiveRow;
+
 interface VariableSymbolInterface
 {
- public function getNew(): string;
+ public function getNew(?ActiveRow $paymentGateway): string;
 }