Shopware6: Optionalen Proxy erlauben und Protokoll http oder https initialisieren

diff --git a/SL/DB/MetaSetup/Shop.pm b/SL/DB/MetaSetup/Shop.pm
index 690afc585370b835e58f15644d0ec756407f78b5..adb6b3a496590d2e2250bcc10048143d6d0cb454 100644 (file)
--- a/SL/DB/MetaSetup/Shop.pm
+++ b/SL/DB/MetaSetup/Shop.pm
@@ -24,6 +24,7 @@ __PACKAGE__->meta->columns(
   price_source             => { type => 'text' },
   pricetype                => { type => 'text' },
   protocol                 => { type => 'text', default => 'http', not_null => 1 },
   price_source             => { type => 'text' },
   pricetype                => { type => 'text' },
   protocol                 => { type => 'text', default => 'http', not_null => 1 },

+  proxy                    => { type => 'text', default => '' },

   realm                    => { type => 'text' },
   server                   => { type => 'text' },
   shipping_costs_parts_id  => { type => 'integer' },
   realm                    => { type => 'text' },
   server                   => { type => 'text' },
   shipping_costs_parts_id  => { type => 'integer' },

diff --git a/SL/DB/Shop.pm b/SL/DB/Shop.pm
index 750e3a3b70f49b3db91493dc4c6492e4a4dd962d..6b00350670cbba1433903a00548b59d0fcc2a249 100644 (file)
--- a/SL/DB/Shop.pm
+++ b/SL/DB/Shop.pm
@@ -21,6 +21,7 @@ sub validate {
   push @errors, $::locale->text('The path is missing.')        unless $self->{path};
   push @errors, $::locale->text('The Host Name is missing')    unless $self->{server};
   push @errors, $::locale->text('The Host Name seems invalid') unless $self->{server} =~ m/[0-9A-Za-z].\.[0-9A-Za-z]/;
   push @errors, $::locale->text('The path is missing.')        unless $self->{path};
   push @errors, $::locale->text('The Host Name is missing')    unless $self->{server};
   push @errors, $::locale->text('The Host Name seems invalid') unless $self->{server} =~ m/[0-9A-Za-z].\.[0-9A-Za-z]/;

+  push @errors, $::locale->text('The Proxy Name seems invalid') unless $self->{proxy} =~ m/[0-9A-Za-z].\.[0-9A-Za-z]/;

   push @errors, $::locale->text('Orders to fetch neeeds a positive Integer')
                                                                unless $self->{orders_to_fetch} > 0;
 
   push @errors, $::locale->text('Orders to fetch neeeds a positive Integer')
                                                                unless $self->{orders_to_fetch} > 0;
 

diff --git a/SL/ShopConnector/Shopware6.pm b/SL/ShopConnector/Shopware6.pm
index 9944b33d9bb84021629af160b1476cf904b7dcc7..38ec37f97911d41a661cb763caa0720429c4fa41 100644 (file)
--- a/SL/ShopConnector/Shopware6.pm
+++ b/SL/ShopConnector/Shopware6.pm
@@ -710,6 +710,9 @@ sub init_connector {
   my ($self) = @_;
 
   my $client = REST::Client->new(host => $self->config->server);
   my ($self) = @_;
 
   my $client = REST::Client->new(host => $self->config->server);

+
+  $client->getUseragent()->proxy([$self->config->protocol], $self->config->proxy) if $self->config->proxy;
+

   $client->addHeader('Content-Type', 'application/json');
   $client->addHeader('charset',      'UTF-8');
   $client->addHeader('Accept',       'application/json');
   $client->addHeader('Content-Type', 'application/json');
   $client->addHeader('charset',      'UTF-8');
   $client->addHeader('Accept',       'application/json');

diff --git a/sql/Pg-upgrade2/shops_6.sql b/sql/Pg-upgrade2/shops_6.sql
new file mode 100644 (file)
index 0000000..788bdb9
--- /dev/null
+++ b/sql/Pg-upgrade2/shops_6.sql
@@ -0,0 +1,6 @@
+-- @tag: shop_add_proxy
+-- @description: Shop-Config um Option Proxy erweitert
+-- @depends: shops_5
+-- @ignore: 0
+
+ALTER TABLE shops ADD COLUMN proxy TEXT default '';

diff --git a/templates/webpages/shops/form.html b/templates/webpages/shops/form.html
index 3ab333ba2c16013017eb4f4132a4c5e70acf5c8e..2f08e728255d9aa494777fedb242578a9073e7ca 100644 (file)
--- a/templates/webpages/shops/form.html
+++ b/templates/webpages/shops/form.html
@@ -43,6 +43,10 @@
     <th align="right">[% 'Port' | $T8 %]</th>
     <td>[%- L.input_tag("shop.port", SELF.shop.port, size=5) %]</td>
   </tr>
     <th align="right">[% 'Port' | $T8 %]</th>
     <td>[%- L.input_tag("shop.port", SELF.shop.port, size=5) %]</td>
   </tr>

+  <tr>
+    <th align="right">[% 'Proxy' | $T8 %]</th>
+    <td>[%- L.input_tag("shop.proxy", SELF.shop.proxy, size=size) %]</td>
+  </tr>

   <tr>
     <th align="right">[% 'Path' | $T8 %]</th>
     <td>[%- L.input_tag("shop.path", SELF.shop.path, size=size) %]</td>
   <tr>
     <th align="right">[% 'Path' | $T8 %]</th>
     <td>[%- L.input_tag("shop.path", SELF.shop.path, size=size) %]</td>