Merge pull request #13 from oservieres/enable-full-test-account-loader

Enable full test account loader

Author: alcalyn

Command/AccountLoaderCommand.php

@@ -39,18 +39,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $output->writeLn('');
             $payplugAccountLoader = $this->getContainer()->get('payplug.account_loader');
-            
-            if (!$input->getOption('no-prod')) {
-                $output->write('Load account parameters... ');
-                $payplugAccountLoader->loadPayplugParameters($mail, $pass);
-                $output->writeLn('     [OK]');
-            }
-            
-            if ($input->getOption('test') || $input->getOption('no-prod')) {
+
+            if ($input->getOption('test')) {
                 $output->write('Load TEST account parameters... ');
-                $payplugAccountLoader->loadPayplugParameters($mail, $pass, true);
-                $output->writeLn('[OK]');
+            } else {
+                $output->write('Load account parameters... ');
             }
+            $payplugAccountLoader->loadPayplugParameters(
+                $mail,
+                $pass,
+                $input->getOption('test'),
+                $input->getOption('no-prod')
+            );
+            $output->writeLn('[OK]');
 
             $output->writeLn('');
             $output->writeLn('[OK] Parameters successfully loaded.');

Resources/doc/test_mode.md

@@ -58,6 +58,7 @@ You can load them by running this command:
 php app/console payplug:account:update --test
 ```
 
+If you just want to load sandbox parameters whithout loading common parameters, you can add the `--no-prod` flag.
 
 > **Note**:
 >

Services/PayplugAccountLoader.php

@@ -43,10 +43,11 @@ public function __construct($rootDir)
      * @param string $mail
      * @param string $pass
      * @param boolean $test
+     * @param boolean $noprod
      * 
      * @throws PayplugException on curl or authentication error
      */
-    public function loadPayplugParameters($mail, $pass, $test = false)
+    public function loadPayplugParameters($mail, $pass, $test = false, $noprod = false)
     {
         $result = $this->curlPayplugRequest($mail, $pass, $test);
 
@@ -64,14 +65,15 @@ public function loadPayplugParameters($mail, $pass, $test = false)
 
         $payplugAccount = array();
 
-        if ($test) {
-            $payplugAccount['parameters']['payplug_sandbox_account_url'] = $params->url;
-            $payplugAccount['parameters']['payplug_sandbox_account_yourPrivateKey'] = $params->yourPrivateKey;
-        } else {
+        if (!$noprod) {
             foreach ($params as $key => $value) {
                 $payplugAccount['parameters']['payplug_account_'.$key] = $value;
             }
         }
+        if ($test) {
+            $payplugAccount['parameters']['payplug_sandbox_account_url'] = $params->url;
+            $payplugAccount['parameters']['payplug_sandbox_account_yourPrivateKey'] = $params->yourPrivateKey;
+        }
 
         $this->editParameters($payplugAccount);
     }