X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FShopConnector%2FShopware6.pm;h=b306014e8aeaa9cfa73fba88d5895d21b46f6067;hb=f11b6653eb047d3059980aa76ffa1bc28d96ac32;hp=b480144c34623ef92461cfc7dcef5f7d7981952e;hpb=412a13b46cae5d4d6dc9c15f8938448d98ea9ae5;p=kivitendo-erp.git diff --git a/SL/ShopConnector/Shopware6.pm b/SL/ShopConnector/Shopware6.pm index b480144c3..b306014e8 100644 --- a/SL/ShopConnector/Shopware6.pm +++ b/SL/ShopConnector/Shopware6.pm @@ -6,11 +6,13 @@ use parent qw(SL::ShopConnector::Base); use Carp; use Encode qw(encode); +use List::Util qw(first); use REST::Client; use Try::Tiny; use SL::JSON; use SL::Helper::Flash; +use SL::Locale::String qw(t8); use Rose::Object::MakeMethods::Generic ( 'scalar --get_set_init' => [ qw(connector) ], @@ -105,8 +107,8 @@ sub update_part { my ($self, $shop_part, $todo) = @_; #shop_part is passed as a param - croak "Need a valid Shop Part for updating Part" unless ref($shop_part) eq 'SL::DB::ShopPart'; - croak "Invalid todo for updating Part" unless $todo =~ m/(price|stock|price_stock|active|all)/; + croak t8("Need a valid Shop Part for updating Part") unless ref($shop_part) eq 'SL::DB::ShopPart'; + croak t8("Invalid todo for updating Part") unless $todo =~ m/(price|stock|price_stock|active|all)/; my $part = SL::DB::Part->new(id => $shop_part->part_id)->load; die "Shop Part but no kivi Part?" unless ref $part eq 'SL::DB::Part'; @@ -137,6 +139,21 @@ sub update_part { my $update_p; $update_p->{productNumber} = $part->partnumber; $update_p->{name} = $part->description; + $update_p->{description} = $shop_part->shop->use_part_longdescription + ? $part->notes + : $shop_part->shop_description; + + # locales simple check for english + my $english = SL::DB::Manager::Language->get_first(query => [ description => { ilike => 'Englisch' }, + or => [ template_code => { ilike => 'en' } ], + ]); + if (ref $english eq 'SL::DB::Language') { + # add english translation for product + # TODO (or not): No Translations for shop_part->shop_description available + my $translation = first { $english->id == $_->language_id } @{ $part->translations }; + $update_p->{translations}->{'en-GB'}->{name} = $translation->{translation}; + $update_p->{translations}->{'en-GB'}->{description} = $translation->{longdescription}; + } $update_p->{stock} = $::form->round_amount($part->onhand, 0) if ($todo =~ m/(stock|all)/); # JSON::true JSON::false @@ -453,7 +470,7 @@ sub get_categories { sub get_one_order { my ($self, $ordnumber) = @_; - die "No ordnumber" unless $ordnumber; + croak t8("No Order Number") unless $ordnumber; # set known params for the return structure my %fetched_order = $self->get_fetched_order_structure; my $assoc = $self->all_open_orders(); @@ -581,6 +598,9 @@ sub get_article { } catch { die "Malformed JSON Data: $_ " . $ret->responseContent(); }; + + # maybe no product was found ... + return undef unless scalar @{ $data_json->{data} } > 0; # caller wants this structure: # $stock_onlineshop = $shop_article->{data}->{mainDetail}->{inStock}; # $active_online = $shop_article->{data}->{active}; @@ -661,40 +681,16 @@ sub init_connector { $client->addHeader('Authorization' => 'Bearer ' . $token); return $client; } -# ua multiple form-data -sub init_ua { - my ($self) = @_; - - my $section = 'bekuplast_elo'; - my $config = $::lx_office_conf{$section} || {}; - my $client; - # mandatory config parameters - foreach (qw(user pass apikey)) { - die "parameter '$_' in section '$section' must be set in config file" if !defined $config->{$_}; - } - $client = REST::Client->new(host => $self->host); - # no test case available in ELO API - # and set ua we need this, because ELO wants multippart/form-data - my $ua = $self->client->getUseragent(); - - $ua->default_header(Authorization => 'Basic ' . encode_base64($config->{user} . ':' . $config->{pass}), - apikey => $config->{apikey}, - 'Content-Type' => 'multipart/form-data', - ); - - return $ua; -} - sub import_data_to_shop_order { my ($self, $import) = @_; # failsafe checks for not yet implemented - die $::locale->text('Shipping cost article not implemented') if $self->config->shipping_costs_parts_id; + die t8('Shipping cost article not implemented') if $self->config->shipping_costs_parts_id; # no mapping unless we also have at least one shop order item ... my $order_pos = delete $import->{lineItems}; - croak("No Order items fetched") unless ref $order_pos eq 'ARRAY'; + croak t8("No Order items fetched") unless ref $order_pos eq 'ARRAY'; my $shop_order = $self->map_data_to_shoporder($import); @@ -725,7 +721,7 @@ sub import_data_to_shop_order { $shop_order->positions($position); if ( $self->config->shipping_costs_parts_id ) { - die "Not yet implemented"; + die t8("Not yet implemented"); # TODO NOT YET Implemented nor tested, this is shopware5 code: my $shipping_part = SL::DB::Part->find_by( id => $self->config->shipping_costs_parts_id); my %shipping_pos = ( description => $import->{data}->{dispatch}->{name}, @@ -752,8 +748,8 @@ sub import_data_to_shop_order { 1; - }) || die ('error while saving shop order ' . $shop_order->{shop_ordernumber} . 'Error: ' . $shop_order->db->error . "\n" . - 'generic exception:' . $@); + }) || die t8('Error while saving shop order #1. DB Error #2. Generic exception #3.', + $shop_order->{shop_ordernumber}, $shop_order->db->error, $@); } sub map_data_to_shoporder { @@ -767,14 +763,14 @@ sub map_data_to_shoporder { && ref $import->{orderCustomer} eq 'HASH'; my $shipto_id = $import->{deliveries}->[0]->{shippingOrderAddressId}; - die "Cannot get shippingOrderAddressId for $import->{orderNumber}" unless $shipto_id; + die t8("Cannot get shippingOrderAddressId for #1", $import->{orderNumber}) unless $shipto_id; my $billing_ary = [ grep { $_->{id} == $import->{billingAddressId} } @{ $import->{addresses} } ]; my $shipto_ary = [ grep { $_->{id} == $shipto_id } @{ $import->{addresses} } ]; my $payment_ary = [ grep { $_->{id} == $import->{paymentMethodId} } @{ $import->{paymentMethods} } ]; - croak("No Billing and ship to address, for Order Number " . $import->{orderNumber} . - "ID Billing:" . $import->{billingAddressId} . " ID Shipping $shipto_id ") + die t8("No Billing and ship to address, for Order Number #1 with ID Billing #2 and ID Shipping #3", + $import->{orderNumber}, $import->{billingAddressId}, $import->{deliveries}->[0]->{shippingOrderAddressId}) unless scalar @{ $billing_ary } == 1 && scalar @{ $shipto_ary } == 1; my $billing = $billing_ary->[0]; @@ -782,9 +778,10 @@ sub map_data_to_shoporder { # TODO payment info is not used at all my $payment = scalar @{ $payment_ary } ? delete $payment_ary->[0] : undef; - croak "No billing city" unless $billing->{city}; - croak "No shipto city" unless $shipto->{city}; - croak "No customer email" unless $import->{orderCustomer}->{email}; + # check mandatory fields from shopware + die t8("No billing city") unless $billing->{city}; + die t8("No shipto city") unless $shipto->{city}; + die t8("No customer email") unless $import->{orderCustomer}->{email}; # extract order date my $parser = DateTime::Format::Strptime->new(pattern => '%Y-%m-%dT%H:%M:%S', @@ -798,6 +795,7 @@ sub map_data_to_shoporder { my $shop_id = $self->config->id; my $tax_included = $self->config->pricetype; + # TODO copied from shopware5 connector # Mapping Zahlungsmethoden muss an Firmenkonfiguration angepasst werden my %payment_ids_methods = ( # shopware_paymentId => kivitendo_payment_id @@ -907,10 +905,23 @@ __END__ =item C +Updates all metadata for a shop part. See base class for a general description. +Specific Implementation notes: +=over 4 + +=item * Calls sync_all_images with set_cover = 1 and delete_orphaned = 1 + +=item * Checks if longdescription should be taken from part or shop_part + +=item * Checks if a language with the name 'Englisch' or template_code 'en' + is available and sets the shopware6 'en-GB' locales for the product + +=back + =item C -The important key for shopware is the image name. To get distinct -entries the kivi partnumber is combined with the title (description) +The connecting key for shopware to kivi images is the image name. +To get distinct entries the kivi partnumber is combined with the title (description) of the image. Therefore part1000_someTitlefromUser should be unique in Shopware. All image data is simply send to shopware whether or not image data @@ -962,6 +973,21 @@ None yet. :) Missing fields are commented in the sub map_data_to_shoporder. Some items are SEPA debit info, IP adress, delivery costs etc Furthermore Shopware6 uses currency, country and locales information. +Detailed list: + + #customer_newsletter => $customer}->{newsletter}, + #remote_ip => $import->{remoteAddress}, + #sepa_account_holder => $import->{paymentIntances}->{accountHolder}, + #sepa_bic => $import->{paymentIntances}->{bic}, + #sepa_iban => $import->{paymentIntances}->{iban}, + #shipping_costs => $import->{invoiceShipping}, + #shipping_costs_net => $import->{invoiceShippingNet}, + #shop_c_billing_id => $import->{billing}->{customerId}, + #shop_c_billing_number => $import->{billing}->{number}, + #shop_c_delivery_id => $import->{shipping}->{id}, + #shop_customer_id => $import->{customerId}, + #shop_customer_number => $import->{billing}->{number}, + #shop_customer_comment => $import->{customerComment}, =item * Use shipping_costs_parts_id for additional shipping costs