diff --git a/fakturoid_api.install b/fakturoid_api.install index 731b5a5..6dbf3e6 100644 --- a/fakturoid_api.install +++ b/fakturoid_api.install @@ -94,5 +94,3 @@ function fakturoid_api_requirements($phase) { return $requirements; } - - diff --git a/fakturoid_api.module b/fakturoid_api.module index 2c2a20e..2d989b2 100644 --- a/fakturoid_api.module +++ b/fakturoid_api.module @@ -4,5 +4,3 @@ * @file * Primary module hooks for Fakturoid API module. */ - - diff --git a/fakturoid_api.routing.yml b/fakturoid_api.routing.yml index 6f2f5b5..2be37d5 100644 --- a/fakturoid_api.routing.yml +++ b/fakturoid_api.routing.yml @@ -13,4 +13,5 @@ fakturoid_api.webhook: _title: 'Handle Fakturoid Webhook' methods: [POST] requirements: + # No access restrictions _access: 'TRUE' diff --git a/fakturoid_api.services.yml b/fakturoid_api.services.yml index ab3389a..9b05a92 100644 --- a/fakturoid_api.services.yml +++ b/fakturoid_api.services.yml @@ -1,5 +1,5 @@ services: fakturoid_api.invoices: - class: Drupal\fakturoid_api\Classes\Fakturoid_invoices + class: Drupal\fakturoid_api\Classes\FakturoidInvoices fakturoid_api.client: - class: Drupal\fakturoid_api\Classes\Fakturoid_client + class: Drupal\fakturoid_api\Classes\FakturoidClient diff --git a/readme.md b/readme.md index 0f18eee..8b5dac0 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,7 @@ -$lines = array(array('name' => 'Big sale', 'quantity' => 1, 'unit_price' => 1000)); - - +$lines = array( + array( + 'name' => 'Big sale', + 'quantity' => 1, + 'unit_price' => 1000 + ) +); diff --git a/src/Classes/Fakturoid_client.php b/src/Classes/Fakturoid_client.php deleted file mode 100644 index d412e2e..0000000 --- a/src/Classes/Fakturoid_client.php +++ /dev/null @@ -1,67 +0,0 @@ -client = new Client($this->slug, $this->api_email, $this->api_key, 'PHPlib'); - } - - /**x - * Returns the Fakturoid client. - * - * @return \Fakturoid\Client - * The Fakturoid client. - */ - public function getClient() { - return $this->client; - } - - /** - * Creates a new client in Fakturoid. - * - * @param array $data - * The client data. - * - * @return mixed - * The created client. - */ - public function createClient(array $data) { - return $this->client->createSubject($data)->getBody(); - } - - public function createInvoice ($data) { - return $this->client->createInvoice($data); - } - public function getInvoicePdf($invoiceId) { - return $this->client->getInvoicePdf($invoiceId); - } - - public function fireInvoice ($invoiceId, $action) { - return $this->client->fireInvoice($invoiceId, $action); - } -} diff --git a/src/Classes/Fakturoid_invoice.php b/src/Classes/Fakturoid_invoice.php deleted file mode 100644 index ff33f09..0000000 --- a/src/Classes/Fakturoid_invoice.php +++ /dev/null @@ -1,130 +0,0 @@ -client = new fakturoid_client(); - } - - /** - * Returns the Fakturoid client. - * - * @return \Fakturoid\Client - * The Fakturoid client. - */ - public function getClient() { - return $this->client; - } - - /** - * Creates a new invoice in Fakturoid. - * - * @param array $data - * The invoice data. - * - * @return mixed - * The created invoice. - */ - public function createInvoice($subject, $custom_id, $lines) { - $response = $this->client->createInvoice(array('subject_id' => $subject['id'],'custom_id' => $custom_id, 'lines' => $lines)); - $invoice = $response->getBody(); - return $invoice; - } - - /** - * Fires an action on the specified invoice in Fakturoid. - * - * @param int $invoiceId - * The ID of the invoice. - * @param string $action - * The action to perform ('deliver', 'pay', 'pay_proforma', 'pay_partial_proforma'). - * - * @return mixed - * The updated invoice. - */ - public function fireInvoiceAction($invoiceId, $action) { - return $this->client->fireInvoice($invoiceId, $action); - } - - /** - * Retrieves an invoice from Fakturoid. - * - * @param int $invoiceId - * The ID of the invoice. - * - * @return mixed - * The retrieved invoice. - */ - public function getInvoice($invoiceId) { - return $this->client->getInvoice($invoiceId)->getBody(); - } - - public function getInvoicePdf($invoiceId) { - $i = 0; - while (true) { - $response = $this->client->getInvoicePdf($invoiceId); - - if ($response->getStatusCode() == 200) { - $data = $response->getBody(); - break; - } - elseif ($i < 5) { - return false; - } - $i++; - sleep(1); - } - return $data; - } - - /** - * Filters subjects based on the custom ID attribute. - * - * @param string $customId - * The custom ID to filter subjects. - * - * @return mixed - * The filtered subjects. - */ - public function filterSubjectsByCustomId($customId) { - $response = $this->client->getSubjects(['custom_id' => $customId]); - return $response->getBody(); - } - - /** - * Retrieves a subject from Fakturoid based on the custom ID attribute. - * - * @param string $customId - * The custom ID to filter subjects. - * - * @return mixed|null - * The retrieved subject, or null if not found. - */ - public function getSubjectByCustomId($customId) { - $subjects = $this->filterSubjectsByCustomId($customId); - if (count($subjects) > 0) { - return $subjects[0]; - } - return null; - } - -} diff --git a/src/Controller/FakturoidApiController.php b/src/Controller/FakturoidApiController.php index c240a86..1df47fb 100644 --- a/src/Controller/FakturoidApiController.php +++ b/src/Controller/FakturoidApiController.php @@ -4,6 +4,7 @@ namespace Drupal\fakturoid_api\Controller; use Drupal\Core\Controller\ControllerBase; use Drupal\Core\Entity\EntityTypeManagerInterface; +use Drupal\Core\Logger\LoggerChannelInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -13,15 +14,40 @@ use Symfony\Component\HttpFoundation\Response; */ class FakturoidApiController extends ControllerBase { + /** + * The node storage. + * + * @var \Drupal\node\NodeStorageInterface + */ protected $nodeStorage; - public function __construct(EntityTypeManagerInterface $entityTypeManager) { + /** + * The logger service. + * + * @var \Drupal\Core\Logger\LoggerChannelInterface + */ + protected $logger; + + /** + * FakturoidApiController constructor. + * + * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager + * The entity type manager. + * @param \Drupal\Core\Logger\LoggerChannelInterface $logger + * The logger service. + */ + public function __construct(EntityTypeManagerInterface $entityTypeManager, LoggerChannelInterface $logger) { $this->nodeStorage = $entityTypeManager->getStorage('node'); + $this->logger = $logger; } + /** + * {@inheritdoc} + */ public static function create(ContainerInterface $container) { return new static( - $container->get('entity_type.manager') + $container->get('entity_type.manager'), + $container->get('logger.channel.subscription_service') ); } @@ -34,26 +60,27 @@ class FakturoidApiController extends ControllerBase { * @return \Symfony\Component\HttpFoundation\Response * The response to the webhook request. */ - public function handleWebhook(Request $request) { // Implement your webhook handling logic here. // Access the request data using $request->getContent() or other methods. - // Example: Log the webhook payload. $payload = json_decode($request->getContent()); - \Drupal::logger('subscription_service')->notice($request); + $this->logger->notice($request); if ($payload) { - $nid = $payload->invoice_custom_id; // Replace with the desired node ID. + // Replace with the desired node ID. + $nid = $payload->invoice_custom_id; $node = $this->nodeStorage->load($nid); - $response = [ - 'status' => 'success', - 'message' => 'OK']; + // $response = [ + // 'status' => 'success', + // 'message' => 'OK', + // ]; } else { - $response = [ - 'status' => 'failed', - 'message' => 'No content']; + // $response = [ + // 'status' => 'failed', + // 'message' => 'No content', + // ]; return new Response('No content', 204); } if (isset($node)) { @@ -66,4 +93,5 @@ class FakturoidApiController extends ControllerBase { // Return a response. return new Response('OK', 200); } + }