Merge remote-tracking branch 'origin/master'

# Conflicts: # src/Requests/CreditnoteRequestBuilder.php
LasseRafn · Dec 11, 2017 · ae0369a · ae0369a
2 parents 769eee4 + ee9f43c
commit ae0369a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/src/Models/Payment.php b/src/Models/Payment.php
@@ -6,15 +6,6 @@ class Payment extends Model
 {
     protected $entity     = 'payments';
     protected $primaryKey = 'Guid';
-    protected $fillable   = [
-        'Guid',
-        'DepositAccountNumber',
-        'ExternalReference',
-        'PaymentDate',
-        'Description',
-        'Amount',
-        'AmountInForeignCurrency'
-    ];
 
     public $Guid;
     public $DepositAccountNumber;
@@ -23,4 +14,4 @@ class Payment extends Model
     public $Description;
     public $Amount;
     public $AmountInForeignCurrency;
-}
+}
diff --git a/src/Requests/InvoiceRequestBuilder.php b/src/Requests/InvoiceRequestBuilder.php
@@ -8,7 +8,7 @@
 class InvoiceRequestBuilder extends RequestBuilder
 {
 	public function __construct( Builder $builder ) {
-		$this->parameters['fields'] = 'CreatedAt,UpdatedAt,DeletedAt,Guid,Date,Status,TotalInclVat,Description,ContactName,Number,Currency,PaymentDate,Type,TotalExclVat,TotalInclVatInDkk,TotalExclVatInDkk,MailOutStatus';
+		$this->parameters['fields'] = 'TimeStamp,CreatedAt,UpdatedAt,DeletedAt,Guid,Date,Status,TotalInclVat,Description,ContactName,Number,Currency,PaymentDate,Type,TotalExclVat,TotalInclVatInDkk,TotalExclVatInDkk,MailOutStatus';
 
 		parent::__construct( $builder );
 	}

diff --git a/src/Utils/Model.php b/src/Utils/Model.php
@@ -7,7 +7,6 @@ class Model
     protected $entity;
     protected $primaryKey;
     protected $modelClass = self::class;
-    protected $fillable = [];
     protected $request;
 
     public function __construct(Request $request, $data = [])