Skip to content

Commit a4139a9

Browse files
abisalehalliprasanabisalehalliprasan
authored
Merge pull request #401 from intuit/v6.0.1
Release: Support for minor version 59 and adding showrows for report service
2 parents 73c395d + 918c276 commit a4139a9

12 files changed

+16156
-15935
lines changed

‎src/Core/CoreConstants.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class CoreConstants
88
{
99
//Set the default minor version
10-
const DEFAULT_SDK_MINOR_VERSION = "57";
10+
const DEFAULT_SDK_MINOR_VERSION = "59";
1111
const DEFAULT_LOGGINGLOCATION = "/tmp/IdsLogs";
1212

1313
const PHP_CLASS_PREFIX = 'IPP';
@@ -297,7 +297,7 @@ class CoreConstants
297297
* The Request source header value.
298298
* @var string REQUESTSOURCEHEADER
299299
*/
300-
const USERAGENT = "V3PHPSDK6.0.0";
300+
const USERAGENT = "V3PHPSDK6.0.1";
301301

302302
public static function getType($string, $return=1)
303303
{

‎src/Data/IPPCustomer.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,19 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
593593
* @var string
594594
*/
595595
public $ClientEntityId;
596+
/**
597+
* @Definition
598+
Product: QBO
599+
Description: Originating source of
600+
the Customer. Valid values are defined in SourceTypeEnum
601+
602+
* @xmlType element
603+
* @xmlNamespace http://schema.intuit.com/finance/v3
604+
* @xmlMinOccurs 0
605+
* @xmlName Source
606+
* @var string
607+
*/
608+
public $Source;
596609

597610

598611
} // end class IPPCustomer

‎src/Data/IPPInvoice.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,30 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
295295
* @var string
296296
*/
297297
public $InvoiceLinkExpiryDate;
298+
/**
299+
* @Definition
300+
Product: QBO
301+
Description: Indicates whether the Recurring Invoice eligible for auto payment.
302+
303+
* @xmlType element
304+
* @xmlNamespace http://schema.intuit.com/finance/v3
305+
* @xmlMinOccurs 0
306+
* @xmlName AutoPayEligible
307+
* @var boolean
308+
*/
309+
public $AutoPayEligible;
310+
/**
311+
* @Definition
312+
Product: QBO
313+
Description: Indicates whether the Non-Recurring Invoice eligible for scheduled payment.
314+
315+
* @xmlType element
316+
* @xmlNamespace http://schema.intuit.com/finance/v3
317+
* @xmlMinOccurs 0
318+
* @xmlName SchedulePayEligible
319+
* @var boolean
320+
*/
321+
public $SchedulePayEligible;
298322

299323

300324
} // end class IPPInvoice

‎src/Data/IPPItem.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,19 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
819819
* @var com\intuit\schema\finance\v3\IPPReferenceType
820820
*/
821821
public $ClassRef;
822+
/**
823+
* @Definition
824+
Product: QBO
825+
Description: Originating source of
826+
the Item. Valid values are defined in SourceTypeEnum
827+
828+
* @xmlType element
829+
* @xmlNamespace http://schema.intuit.com/finance/v3
830+
* @xmlMinOccurs 0
831+
* @xmlName Source
832+
* @var string
833+
*/
834+
public $Source;
822835

823836

824837
} // end class IPPItem

‎src/Data/IPPRecurringInfo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
5252
*/
5353
public $Name;
5454
/**
55-
* @Definition
55+
* @Definition
5656
Product: QBO
5757
Description: The Recur Type which can be Automated, Reminded, UnScheduled or Manual.
5858
@@ -64,7 +64,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
6464
*/
6565
public $RecurType;
6666
/**
67-
* @Definition
67+
* @Definition
6868
Product: QBO
6969
Description: Indicates whether the Recurring Schedule is enabled.
7070

‎src/Data/IPPRecurringScheduleInfo.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
5252
*/
5353
public $IntervalType;
5454
/**
55-
* @Definition
55+
* @Definition
5656
Product: QBO
5757
Description: The Interval based on the Interval Type
5858
@@ -64,7 +64,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
6464
*/
6565
public $NumInterval;
6666
/**
67-
* @Definition
67+
* @Definition
6868
Product: QBO
6969
Description: The Day of the Month
7070
@@ -76,7 +76,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
7676
*/
7777
public $DayOfMonth;
7878
/**
79-
* @Definition
79+
* @Definition
8080
Product: QBO
8181
Description: The Day of the Week
8282
@@ -100,7 +100,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
100100
*/
101101
public $WeekOfMonth;
102102
/**
103-
* @Definition
103+
* @Definition
104104
Product: QBO
105105
Description: The Month of the Year
106106
@@ -112,7 +112,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
112112
*/
113113
public $MonthOfYear;
114114
/**
115-
* @Definition
115+
* @Definition
116116
Product: QBO
117117
Description: The days before StartDate for a Reminded RecurType
118118
@@ -124,7 +124,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
124124
*/
125125
public $RemindDays;
126126
/**
127-
* @Definition
127+
* @Definition
128128
Product: QBO
129129
Description: The Days before the Scheduled Date
130130
@@ -136,7 +136,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
136136
*/
137137
public $DaysBefore;
138138
/**
139-
* @Definition
139+
* @Definition
140140
Product: QBO
141141
Description: The Max number of Recurring Occurrences
142142
@@ -148,7 +148,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
148148
*/
149149
public $MaxOccurrences;
150150
/**
151-
* @Definition
151+
* @Definition
152152
Product: QBO
153153
Description: The Start Date for the Recurring Schedule
154154
@@ -160,7 +160,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
160160
*/
161161
public $StartDate;
162162
/**
163-
* @Definition
163+
* @Definition
164164
Product: QBO
165165
Description: The End Date for the Recurring Schedule
166166
@@ -172,7 +172,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
172172
*/
173173
public $EndDate;
174174
/**
175-
* @Definition
175+
* @Definition
176176
Product: QBO
177177
Description: The Date when the next Transaction will created. (Read Only)
178178
@@ -184,7 +184,7 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
184184
*/
185185
public $NextDate;
186186
/**
187-
* @Definition
187+
* @Definition
188188
Product: QBO
189189
Description: The Date when the last Transaction was created.(Read Only)
190190

‎src/Data/IPPSourceTypeEnum.php

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?php
2+
namespace QuickBooksOnline\API\Data;
3+
4+
/**
5+
* @xmlNamespace http://schema.intuit.com/finance/v3
6+
* @xmlType string
7+
* @xmlName IPPSourceTypeEnum
8+
* @var IPPSourceTypeEnum
9+
* @xmlDefinition
10+
Product: QBO
11+
Description: Enumeration of external sources that create the entites in QBO
12+
13+
*/
14+
class IPPSourceTypeEnum
15+
{
16+
17+
/**
18+
* Initializes this object, optionally with pre-defined property values
19+
*
20+
* Initializes this object and it's property members, using the dictionary
21+
* of key/value pairs passed as an optional argument.
22+
*
23+
* @param dictionary $keyValInitializers key/value pairs to be populated into object's properties
24+
* @param boolean $verbose specifies whether object should echo warnings
25+
*/
26+
public function __construct($keyValInitializers=array(), $verbose=FALSE)
27+
{
28+
foreach($keyValInitializers as $initPropName => $initPropVal)
29+
{
30+
if (property_exists('IPPSourceTypeEnum',$initPropName) || property_exists('QuickBooksOnline\API\Data\IPPSourceTypeEnum',$initPropName))
31+
{
32+
$this->{$initPropName} = $initPropVal;
33+
}
34+
else
35+
{
36+
if ($verbose)
37+
echo "Property does not exist ($initPropName) in class (".get_class($this).")";
38+
}
39+
}
40+
}
41+
42+
/**
43+
* @xmlType value
44+
* @var string
45+
*/
46+
public $value;
47+
48+
} // end class IPPSourceTypeEnum

‎src/Data/IPPVendor.php

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,19 @@ public function __construct($keyValInitializers=array(), $verbose=FALSE)
455455
* @var com\intuit\schema\finance\v3\IPPVendorBankAccountDetail
456456
*/
457457
public $VendorPaymentBankDetail;
458+
/**
459+
* @Definition
460+
Product: QBO
461+
Description: Originating source of
462+
the Vendor. Valid values are defined in SourceTypeEnum
463+
464+
* @xmlType element
465+
* @xmlNamespace http://schema.intuit.com/finance/v3
466+
* @xmlMinOccurs 0
467+
* @xmlName Source
468+
* @var string
469+
*/
470+
public $Source;
458471

459472

460473
} // end class IPPVendor

‎src/ReportService/ReportService.php

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,31 +98,32 @@ class ReportService
9898
private $subcol_pct_inc = null;
9999
private $subcol_pct_exp = null;
100100
private $adjusted_gain_loss = null;
101+
private $showrows = null;
101102

102103
public function getAdjustedGainLoss(){
103-
return $this->adjusted_gain_loss;
104+
return $this->adjusted_gain_loss;
104105
}
105106

106107
public function setAdjustedGainLoss($adjustedGainLoss){
107-
return $this->adjusted_gain_loss = $adjustedGainLoss;
108+
return $this->adjusted_gain_loss = $adjustedGainLoss;
108109
}
109110

110111
public function getPercentIncome(){
111-
return $this->subcol_pct_inc;
112+
return $this->subcol_pct_inc;
112113
}
113114

114115
public function getPercentExpense(){
115-
return $this->subcol_pct_exp;
116+
return $this->subcol_pct_exp;
116117
}
117118

118119
public function setPercentIncome($percentIncome){
119-
$this->subcol_pct_inc = $percentIncome;
120-
return $this;
120+
$this->subcol_pct_inc = $percentIncome;
121+
return $this;
121122
}
122123

123124
public function setPercentExpense($percentExpense){
124-
$this->subcol_pct_exp = $percentExpense;
125-
return $this;
125+
$this->subcol_pct_exp = $percentExpense;
126+
return $this;
126127
}
127128
/**
128129
* @return null
@@ -960,6 +961,25 @@ public function setDocNum($doc_num)
960961
return $this;
961962
}
962963

964+
/**
965+
* @return null
966+
*/
967+
public function getShowRows()
968+
{
969+
return $this->showrows;
970+
}
971+
972+
/**
973+
* @param null $showrows
974+
*
975+
* @return $this
976+
*/
977+
public function setShowRows($showrows)
978+
{
979+
$this->showrows = $showrows;
980+
return $this;
981+
}
982+
963983
/**
964984
* Returns serializer for response objects
965985
* @return IEntitySerializer
@@ -1193,6 +1213,10 @@ private function getReportQueryParameters()
11931213
array_push($uriParameterList, ["adjusted_gain_loss", $this->getAdjustedGainLoss()]);
11941214
}
11951215

1216+
if (!is_null($this->showrows)) {
1217+
array_push($uriParameterList, ["showrows", $this->getShowRows()]);
1218+
}
1219+
11961220

11971221
foreach ($uriParameterList as $uriParameter) {
11981222
if (strlen($uriParameterString) > 0) {

0 commit comments

Comments
 (0)