Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
fe072d99
Commit
fe072d99
authored
12 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: WSDL of productorservice was not valid. Normalize field names.
parent
710ea872
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
htdocs/webservices/server_productorservice.php
+33
-36
33 additions, 36 deletions
htdocs/webservices/server_productorservice.php
with
33 additions
and
36 deletions
htdocs/webservices/server_productorservice.php
+
33
−
36
View file @
fe072d99
...
...
@@ -113,15 +113,13 @@ $server->wsdl->addComplexType(
'price_net'
=>
array
(
'name'
=>
'price_net'
,
'type'
=>
'xsd:string'
),
'price'
=>
array
(
'name'
=>
'price'
,
'type'
=>
'xsd:string'
),
'price_
ttc
'
=>
array
(
'name'
=>
'price_
ttc
'
,
'type'
=>
'xsd:string'
),
'price_
min_net
'
=>
array
(
'name'
=>
'price_
min_net
'
,
'type'
=>
'xsd:string'
),
'price_min'
=>
array
(
'name'
=>
'price_min'
,
'type'
=>
'xsd:string'
),
'price_min_ttc'
=>
array
(
'name'
=>
'price_min_ttc'
,
'type'
=>
'xsd:string'
),
'price_base_type'
=>
array
(
'name'
=>
'price_base_type'
,
'type'
=>
'xsd:string'
),
'vat_rate'
=>
array
(
'name'
=>
'vat_rate'
,
'type'
=>
'xsd:string'
),
'tva_tx'
=>
array
(
'name'
=>
'tva_tx'
,
'type'
=>
'xsd:string'
),
'tva_npr'
=>
array
(
'name'
=>
'tva_npr'
,
'type'
=>
'xsd:string'
),
'vat_npr'
=>
array
(
'name'
=>
'vat_npr'
,
'type'
=>
'xsd:string'
),
'localtax1_tx'
=>
array
(
'name'
=>
'localtax1_tx'
,
'type'
=>
'xsd:string'
),
'localtax2_tx'
=>
array
(
'name'
=>
'localtax2_tx'
,
'type'
=>
'xsd:string'
),
...
...
@@ -132,7 +130,7 @@ $server->wsdl->addComplexType(
'import_key'
=>
array
(
'name'
=>
'import_key'
,
'type'
=>
'xsd:string'
),
'dir'
=>
array
(
'name'
=>
'dir'
,
'type'
=>
'xsd:string'
),
'
photo
s'
=>
array
(
'name'
=>
'
photo
s'
,
'type'
=>
'tns:
Photo
sArray'
)
'
image
s'
=>
array
(
'name'
=>
'
image
s'
,
'type'
=>
'tns:
Image
sArray'
)
)
);
...
...
@@ -141,14 +139,18 @@ $server->wsdl->addComplexType(
* Image of product
*/
$server
->
wsdl
->
addComplexType
(
'
Photo
sArray'
,
'
Image
sArray'
,
'complexType'
,
'array'
,
'sequence'
,
''
,
'SOAP-ENC:Array'
,
array
(),
array
(
array
(
'ref'
=>
'SOAP-ENC:arrayType'
,
'wsdl:arrayType'
=>
'tns:image[]'
)
'image'
=>
array
(
'name'
=>
'image'
,
'type'
=>
'tns:image'
,
'minOccurs'
=>
'0'
,
'maxOccurs'
=>
'unbounded'
)
)
);
...
...
@@ -158,10 +160,9 @@ $server->wsdl->addComplexType(
$server
->
wsdl
->
addComplexType
(
'image'
,
'complexType'
,
'array'
,
'struct'
,
'all'
,
''
,
'SOAP-ENC:Array'
,
array
(),
array
(
'photo'
=>
array
(
'name'
=>
'photo'
,
'type'
=>
'xsd:string'
),
'photo_vignette'
=>
array
(
'name'
=>
'photo_vignette'
,
'type'
=>
'xsd:string'
),
...
...
@@ -186,7 +187,7 @@ $server->wsdl->addComplexType(
)
);
$server
->
wsdl
->
addComplexType
(
/*
$server->wsdl->addComplexType(
'ProductsArray',
'complexType',
'array',
...
...
@@ -197,7 +198,7 @@ $server->wsdl->addComplexType(
array('ref'=>'SOAP-ENC:arrayType','wsdl:arrayType'=>'tns:product[]')
),
'tns:product'
);
);
*/
$server
->
wsdl
->
addComplexType
(
'ProductsArray2'
,
'complexType'
,
...
...
@@ -272,7 +273,7 @@ $server->register(
// Entry values
array
(
'authentication'
=>
'tns:authentication'
,
'id'
=>
'xsd:string'
),
// Exit values
array
(
'result'
=>
'tns:result'
,
'products'
=>
'ProductsArray'
),
array
(
'result'
=>
'tns:result'
,
'products'
=>
'
tns:
ProductsArray
2
'
),
$ns
,
$ns
.
'#getProductsForCategory'
,
$styledoc
,
...
...
@@ -345,22 +346,18 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='')
'country_code'
=>
$product
->
country_code
,
'custom_code'
=>
$product
->
customcode
,
'price_net'
=>
$product
->
price
,
// todo : DEPRECATED ?
//'price' => ($product->price_ttc-$product->price),
'price'
=>
$product
->
price
,
'price_ttc'
=>
$product
->
price_ttc
,
'price_min'
=>
$product
->
price_min
,
'price_min_ttc'
=>
$product
->
price_min_ttc
,
'price_net'
=>
$product
->
price
,
'price'
=>
$product
->
price_ttc
,
'price_min_net'
=>
$product
->
price_min
,
'price_min'
=>
$product
->
price_min_ttc
,
'price_base_type'
=>
$product
->
price_base_type
,
'vat_rate'
=>
$product
->
tva_tx
,
// todo : DEPRECATED ?
'tva_tx'
=>
$product
->
tva_tx
,
'vat_rate'
=>
$product
->
tva_tx
,
//! French VAT NPR
'
t
va_npr'
=>
$product
->
tva_npr
,
'va
t
_npr'
=>
$product
->
tva_npr
,
//! Spanish local taxes
'localtax1_tx'
=>
$product
->
localtax1_tx
,
'localtax2_tx'
=>
$product
->
localtax2_tx
,
'price_ttc'
=>
$product
->
price_ttc
,
'price_base_type'
=>
$product
->
price_base_type
,
'stock_real'
=>
$product
->
stock_reel
,
...
...
@@ -368,7 +365,7 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='')
'pmp'
=>
$product
->
pmp
,
'import_key'
=>
$product
->
import_key
,
'dir'
=>
$pdir
,
'
photo
s'
=>
$product
->
liste_photos
(
$dir
,
$nbmax
=
10
)
'
image
s'
=>
$product
->
liste_photos
(
$dir
,
$nbmax
=
10
)
));
}
else
...
...
@@ -651,9 +648,9 @@ function getProductsForCategory($authentication,$id)
'custom_code'
=>
$obj
->
customcode
,
'price_net'
=>
$obj
->
price
,
'price'
=>
(
$obj
->
price_ttc
-
$obj
->
price
)
,
'price'
=>
$obj
->
price_ttc
,
'vat_rate'
=>
$obj
->
tva_tx
,
'price_ttc'
=>
$obj
->
price_ttc
,
'price_base_type'
=>
$obj
->
price_base_type
,
'stock_real'
=>
$obj
->
stock_reel
,
...
...
@@ -661,7 +658,7 @@ function getProductsForCategory($authentication,$id)
'pmp'
=>
$obj
->
pmp
,
'import_key'
=>
$obj
->
import_key
,
'dir'
=>
$pdir
,
'
photo
s'
=>
$obj
->
liste_photos
(
$dir
,
$nbmax
=
10
)
'
image
s'
=>
$obj
->
liste_photos
(
$dir
,
$nbmax
=
10
)
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment