mz/crm.e5.pl
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Update REST: copy sale from Twinpol

Browse Source
This commit is contained in:
Michał Zieliński
2025-04-16 18:04:18 +00:00
parent 8095cfe88a
commit 62658a1fbb
7 changed files with 864 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
REST/functions.php
View File

@@ -56,26 +56,38 @@
$gotAllProducts = false;
continue;
} else {
$fvPrice = $db->fetchByAssoc($db->query("
SELECT i.id, i.document_no, ii.price_start, ii.ecmvat_value, ii.ecmvat_name, ii.ecmvat_id
FROM ecminvoiceoutitems AS ii
INNER JOIN ecminvoiceouts AS i
ON i.id = ii.ecminvoiceout_id
WHERE
i.parent_id= '1b9643ca-5b1a-8f9b-b809-586b5619b068' AND
i.currency_id = 'PLN' AND
ii.ecmproduct_id = '$p->id'
ORDER BY i.register_date DESC
LIMIT 0,1
"));
if (!isset($fvPrice)) {
$price_start = 0;
echo " <b>Brak ceny</b><br>";
// pricebook price?
$pricebookPrice = $db->fetchByAssoc($db->query("
SELECT price FROM ecmpricebooks_ecmproducts
WHERE ecmpricebook_id = '3e78ac33-7c46-1b94-0a67-653a17c06f9e'
AND ecmproduct_id='$p->id'
AND deleted=0 LIMIT 0,1"));
if (isset($pricebookPrice)) {
$price_start = $pricebookPrice['price'];
echo " Cena: ".$price_start." (<a href=\"https://crm.e5.pl/index.php?module=EcmPriceBooks&action=DetailView&record=3e78ac33-7c46-1b94-0a67-653a17c06f9e\" target=\"new\">Amazon_2023</a>)<br>";
} else {
$price_start = $fvPrice['price_start'];
echo " cena: ".$price_start." (<a href=\"https://crm.e5.pl/index.php?module=EcmInvoiceOuts&action=DetailView&record=".$fvPrice['id']."\" target=\"new\">".$fvPrice['document_no']."</a>)<br>";
}
// invoice price?
$fvPrice = $db->fetchByAssoc($db->query("
SELECT i.id, i.document_no, ii.price_start, ii.ecmvat_value, ii.ecmvat_name, ii.ecmvat_id
FROM ecminvoiceoutitems AS ii
INNER JOIN ecminvoiceouts AS i
ON i.id = ii.ecminvoiceout_id
WHERE
i.parent_id= '1b9643ca-5b1a-8f9b-b809-586b5619b068' AND
i.currency_id = 'PLN' AND
ii.ecmproduct_id = '$p->id'
ORDER BY i.register_date DESC
LIMIT 0,1
"));
if (!isset($fvPrice)) {
$price_start = 0;
echo " <b>Brak ceny</b><br>";
} else {
$price_start = $fvPrice['price_start'];
echo " Cena: ".$price_start." (<a href=\"https://crm.e5.pl/index.php?module=EcmInvoiceOuts&action=DetailView&record=".$fvPrice['id']."\" target=\"new\">".$fvPrice['document_no']."</a>)<br>";
}
}
$prod = array();
@@ -176,7 +188,6 @@
NIP: ".$sale->shipping_nip."
ILN: ".$sale->shipping_iln;
$newId = $new->save(true);
//update E5 number in Twinpol

4
include/language/en_us.EcmDropdownEditor.php
View File

@@ -1,5 +1,5 @@
<?php
// created: 2025-03-31 14:19:04
// created: 2025-04-10 09:38:48
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -75,6 +75,7 @@ $customDoms = array (
'225115e4-1ce2-9a98-b7a0-672930e3318c' => 'Blister tabletki 10szt. 2 g',
'e6900d92-6fde-90e6-b872-67d1938745e6' => 'Słoik 400 ml',
'e3e0c9da-6d08-e1e0-b9ba-67eaa437cb84' => 'Bottle B1_30ml',
'8bcf43bf-7b49-5dbf-6b86-67f6c12b82d7' => 'Softpack',
),
'ecmproducts_brand_dom' =>
array (
@@ -163,6 +164,7 @@ $customDoms = array (
'661388b9-ac42-d5a8-2503-67b856a06f52' => 'Coffeeano',
'1f9d4c5d-670e-4c77-d4de-67cddc908559' => 'DeCal',
'5c883b90-f1fb-83d1-6347-67dbd49469f0' => 'EntertainME',
'b1df2c57-aef2-290f-c207-67f7916afed9' => 'Mistify',
),
'ecmproducts_category_dom' =>
array (

4
include/language/pl_pl.EcmDropdownEditor.php
View File

@@ -1,5 +1,5 @@
<?php
// created: 2025-03-31 14:19:04
// created: 2025-04-10 09:38:48
$customDoms = array (
'ecmproducts_attribute_dom' =>
array (
@@ -75,6 +75,7 @@ $customDoms = array (
'225115e4-1ce2-9a98-b7a0-672930e3318c' => 'Blister tabletki 10szt. 2 g',
'e6900d92-6fde-90e6-b872-67d1938745e6' => 'Słoik 400 ml',
'e3e0c9da-6d08-e1e0-b9ba-67eaa437cb84' => 'Butelka B1_30ml',
'8bcf43bf-7b49-5dbf-6b86-67f6c12b82d7' => 'Softpack',
),
'ecmproducts_brand_dom' =>
array (
@@ -163,6 +164,7 @@ $customDoms = array (
'661388b9-ac42-d5a8-2503-67b856a06f52' => 'Coffeeano',
'1f9d4c5d-670e-4c77-d4de-67cddc908559' => 'DeCal',
'5c883b90-f1fb-83d1-6347-67dbd49469f0' => 'EntertainME',
'b1df2c57-aef2-290f-c207-67f7916afed9' => 'Mistify',
),
'ecmproducts_category_dom' =>
array (

4
modules/EcmInvoiceOuts/EcmInvoiceOut.php
View File

@@ -114,9 +114,11 @@ class EcmInvoiceOut extends SugarBean {
var $user;
var $mfp;
var $canceled;
// added 4.03.2009
var $pricebook_id;
var $show_recipient_code;
var $total_netto;
var $total_brutto;
var $vats_summary;
// RELATED FIELDS
var $created_by;
var $created_by_name;

1593
modules/EcmProducts/EcmProduct.php
View File

File diff suppressed because it is too large Load Diff

18
modules/EcmSales/EcmSale.php
View File

@@ -119,6 +119,24 @@ class EcmSale extends SugarBean
// added 4.03.2009
var $pricebook_id;
var $show_recipient_code;
var $vats_summary;
var $shipping_address_name;
var $shipping_address_street;
var $shipping_address_postalcode;
var $shipping_address_city;
var $shipping_address_country;
var $shipping_iln;
var $shipping_nip;
var $edi_zs_id;
var $edi_zs_document_no;
var $pdf_text;
var $parent_nip;
var $parent_iln;
var $total_netto;
var $total_brutto;
var $send_date;
var $delivery_date;
var $parent_document_no;
// RELATED FIELDS
var $created_by;
var $created_by_name;

4
modules/EcmStockStates/rebuildStates.php
View File

@@ -29,12 +29,12 @@ if (isset($_GET['ids'])) {
order by date_entered");
}
brecho($codes);
//die();
while($r=$GLOBALS['db']->fetchByAssoc($w)){
if(!in_array($r['stock_id'],$sarr))$sarr[]=$r['stock_id'];
if(!in_array($r['product_id'],$parr))$parr[]=$r['product_id'];
brecho($r['stock_id'],$r['product_id']);
}
for($i=0;$i<count($parr);$i++){