Merge branch 'debian' into b-3.6.1

[kivitendo-erp.git] / SL / ShopConnector / Shopware.pm

diff --git a/SL/ShopConnector/Shopware.pm b/SL/ShopConnector/Shopware.pm
index 79f7cd6..65c42fd 100644 (file)
--- a/SL/ShopConnector/Shopware.pm
+++ b/SL/ShopConnector/Shopware.pm
@@ -11,6 +11,7 @@ use LWP::Authen::Digest;
 use SL::DB::ShopOrder;
 use SL::DB::ShopOrderItem;
 use SL::DB::History;
+use SL::DB::PaymentTerm;
 use DateTime::Format::Strptime;
 use SL::DB::File;
 use Data::Dumper;
@@ -185,6 +186,12 @@ sub map_data_to_shoporder {
   my $shop_id      = $self->config->id;
   my $tax_included = $self->config->pricetype;
 
+  # Mapping Zahlungsmethoden muss an Firmenkonfiguration angepasst werden
+  my %payment_ids_methods = (
+    # shopware_paymentId => kivitendo_payment_id
+  );
+  my $default_payment    = SL::DB::Manager::PaymentTerm->get_first();
+  my $default_payment_id = $default_payment ? $default_payment->id : undef;
   # Mapping to table shoporders. See http://community.shopware.com/_detail_1690.html#GET_.28Liste.29
   my %columns = (
     amount                  => $import->{data}->{invoiceAmount},
@@ -232,7 +239,7 @@ sub map_data_to_shoporder {
     netamount               => $import->{data}->{invoiceAmountNet},
     order_date              => $orderdate,
     payment_description     => $import->{data}->{payment}->{description},
-    payment_id              => $import->{data}->{paymentId},
+    payment_id              => $payment_ids_methods{$import->{data}->{paymentId}} || $default_payment_id,
     remote_ip               => $import->{data}->{remoteAddress},
     sepa_account_holder     => $import->{data}->{paymentIntances}->{accountHolder},
     sepa_bic                => $import->{data}->{paymentIntances}->{bic},
@@ -416,7 +423,7 @@ sub update_part {
   return $upload_content->{success};
 }
 
-sub get_parts_info {
+sub get_article {
   my ($self,$partnumber) = @_;
 
   my $url       = $self->url;
@@ -461,7 +468,7 @@ __END__
 
 =head1 NAME
 
-SL::Shopconnecter::Shopware - connector for shopware 5
+SL::Shopconnector::Shopware - connector for shopware 5
 
 =head1 SYNOPSIS