add Manual

.idea/CdsConnector.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="App\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/serializer" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/form" />

.idea/php.xml

@@ -166,6 +166,7 @@
       <path value="$PROJECT_DIR$/vendor/psr/http-client" />
       <path value="$PROJECT_DIR$/vendor/psr/http-factory" />
       <path value="$PROJECT_DIR$/vendor/http-interop/http-factory-guzzle" />
+      <path value="$PROJECT_DIR$/vendor/deployer/deployer" />
     </include_path>
   </component>
   <component name="PhpInterpreters">

README.md

@@ -9,14 +9,14 @@ Connector zwischen Hiltes und JTL Wawi
 --------------
 
 > git clone https://gitbase.de/OrangeJungle/CdsConnector.git
- 
-> cd CdsConnector 
+
+> cd CdsConnector
 
 Installiere Abhängigkeiten
 > make install
 
 Erstelle .env.local Datei und füge folgendes ein:
-> DATABASE_URL=mysql://root:root@mysql:3306/cds_connector 
+> DATABASE_URL=mysql://root:root@mysql:3306/cds_connector
 
 Starte MySQL-Server:
 > docker compose up
@@ -31,16 +31,47 @@ Update der Datenbank
 > bin/console doctrine:migrations:execute
 
 Starte Server
-> make dev-server  
+> make dev-server
 
 API-Übersicht
 > https://127.0.0.1:8000/api
- 
-Update Symphony 
+
+Update Symphony
 > composer update
 
+
 # Benutzen
 --------------
 
-Hiltes Import 
-> bin/console hiltes:import
+Hiltes Import full Import
+Kompletter Abgleich aller Bestände
+> bin/console hiltes:import
+
+Delta Import
+Die Delta Datei baut sich über den Tag auf und enthält alle Änderungen seit dem letzten full export von Hiltes
+> bin/console hiltes:import --d
+
+# Hosting
+--------------
+
+https://cloud.iteckse.de/
+
+hier laufen 2 Cronjobs:
+
+Täglich um 01:01 Uhr der full Import
+> /home/users/orangejungle/www/bin/console hiltes:import
+
+Alle 5 Minuten der Delta Import
+> 1-56/5 0-1,2-23 * * * /home/users/orangejungle/www/bin/console hiltes:import --d
+
+# JTL
+--------------
+In Windows Aufgabenplanung die Aufgabe JTL Bestandsimport alle 5 Minuten ausgeführt
+Diese ruft das Script C:\CloudFTP\import_delta.bat auf
+
+Einmal um 01:008 Uhr läuft die Aufgabe für den komplett Import diese ruft das Script C:\CloudFTP\import_full.bat auf
+
+die Scripte sind im Order "jtlscript" zu finden
+
+# Slack
+--------------

composer.json

@@ -42,6 +42,7 @@
     "symfony/yaml": "6.3.*"
   },
   "require-dev": {
+    "deployer/deployer": "^7.3",
     "phpunit/phpunit": "^9",
     "symfony/browser-kit": "6.3.*",
     "symfony/css-selector": "6.3.*",
@@ -105,4 +106,4 @@
       "require": "6.3.*"
     }
   }
-}
+}

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "99e32124704ffee3e733c369423458e6",
+    "content-hash": "77d5a0ad3536fb001401c6d4748464b8",
     "packages": [
         {
             "name": "api-platform/core",
@@ -8488,6 +8488,49 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "deployer/deployer",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/deployphp/deployer.git",
+                "reference": "3535bdb2f6360662bd95f6e26fce31dbc269af64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/deployphp/deployer/zipball/3535bdb2f6360662bd95f6e26fce31dbc269af64",
+                "reference": "3535bdb2f6360662bd95f6e26fce31dbc269af64",
+                "shasum": ""
+            },
+            "bin": [
+                "dep"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Anton Medvedev",
+                    "email": "anton@medv.io"
+                }
+            ],
+            "description": "Deployment Tool",
+            "homepage": "https://deployer.org",
+            "support": {
+                "docs": "https://deployer.org/docs",
+                "issues": "https://github.com/deployphp/deployer/issues",
+                "source": "https://github.com/deployphp/deployer"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/antonmedv",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-11-07T10:27:12+00:00"
+        },
         {
             "name": "masterminds/html5",
             "version": "2.8.1",

deploy.php

@@ -0,0 +1,22 @@
+<?php
+namespace Deployer;
+
+require 'recipe/symfony.php';
+
+// Config
+
+set('repository', 'https://gitbase.de/OrangeJungle/CdsConnector.git');
+
+add('shared_files', []);
+add('shared_dirs', []);
+add('writable_dirs', []);
+
+// Hosts
+
+host('connector.orangejungle.eu')
+    ->set('remote_user', 'orangejungle')
+    ->set('deploy_path', '~/CdsConnector');
+
+// Hooks
+
+after('deploy:failed', 'deploy:unlock');

deploy.yaml

@@ -1,21 +0,0 @@
-import:
-  - recipe/symfony.php
-
-config:
-  repository: 'https://mmoeller:Linchen90@gitbase.de/OrangeJungle/CdsConnector.git'
-
-
-
-hosts:
-  192.168.178.95:
-    alias: 'staging'
-    remote_user: pi
-    deploy_path: '~/CdsConnector'
-
-tasks:
-  build:
-    - cd: '{{release_path}}'
-    - run: 'make install'
-
-after:
-  deploy:failed: deploy:unlock

jtlscript/import_delta.bat

@@ -0,0 +1,13 @@
+@echo off
+
+set "AMEISE_PATH=C:\Program Files (x86)\JTL-Software\JTL-wawi-ameise.exe"
+set "AMEISE_ARGS=-s c12465.servers.ecomdata.de\JTLWAWI -d eazybusiness -u sa -p IuCWdx-4xCo3 -t IMP10 --loglevel=5 --log=stock-standard_delta.log --writeLogAtEnd"
+
+
+"%AMEISE_PATH%" %AMEISE_ARGS% -i stock_standard_delta.csv
+
+set "AMEISE_ARGS=-s c12465.servers.ecomdata.de\JTLWAWI -d eazybusiness -u sa -p IuCWdx-4xCo3 -t IMP16 --loglevel=5 --log=stock-wms_delta.log --writeLogAtEnd"
+
+"%AMEISE_PATH%" %AMEISE_ARGS% -i stock_wms_delta.csv
+
+exit

jtlscript/import_full.bat

@@ -0,0 +1,13 @@
+@echo off
+
+set "AMEISE_PATH=C:\Program Files (x86)\JTL-Software\JTL-wawi-ameise.exe"
+set "AMEISE_ARGS=-s c12465.servers.ecomdata.de\JTLWAWI -d eazybusiness -u sa -p IuCWdx-4xCo3 -t IMP10"
+
+
+"%AMEISE_PATH%" %AMEISE_ARGS% -i stock_standard.csv >> stock-standard_full.log
+
+set "AMEISE_ARGS=-s c12465.servers.ecomdata.de\JTLWAWI -d eazybusiness -u sa -p IuCWdx-4xCo3 -t IMP16"
+
+"%AMEISE_PATH%" %AMEISE_ARGS% -i stock_wms.csv >> stock-wms_full.log
+
+exit

src/Helper/Hiltes.php

@@ -173,7 +173,7 @@ class Hiltes
             );
 
             //$data = $this->createJson($arr);
-            $this->logger->info(var_export($arr, 1));
+            //$this->logger->info(var_export($arr, 1));
 
             try {
                 return $this->sendOrderToHiltes($arr);
@@ -350,10 +350,7 @@ class Hiltes
     public function sendOrderToHiltes($data): bool
     {
         $url = $this->hiltesApiUrl . '/api/WebSale/import';
-
-        $param = $data;
-        //dump($param);
-        $r = $this->sendToHiltes($url, $param, true);
+        $r = $this->sendToHiltes($url, $data, true);
         //$r = true;
 
         if ($r === false) {
@@ -366,7 +363,7 @@ class Hiltes
         try {
             $order = $this->orderRepository->findOneBy(array('orderId' => $data['SaleList'][0]['OrderNumber']));
             $order->setStatus(3);
-            $order->setHiltes(var_export($r, 1));
+            $order->setHiltes($t);
 
             $this->orderRepository->update($order, true);
         } catch (\Exception $exception) {