Skip to content

Commit bfa39de

Browse files
GhostscypherGhostscypher
committed
Fix: validation issues, updates for till numbers
1 parent 0c57a4d commit bfa39de

File tree

7 files changed

+92
-92
lines changed

7 files changed

+92
-92
lines changed

‎src/Concerns/MpesaB2B.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ public function B2B(
6767
'QueueTimeOutURL' => $queue_timeout_url ?? self::generateCallbackUrl(config('mpesa.b2b_timeout_url')),
6868
'ResultURL' => $result_url ?? self::generateCallbackUrl(config('mpesa.b2b_result_url')),
6969
], [
70-
'OriginatorConversationID' => 'required|string',
71-
'Initiator' => 'required|string',
72-
'SecurityCredential' => 'required|string',
73-
'CommandID' => 'required|string|in:BusinessPayBill,BusinessBuyGoods,BusinessPayToBulk,DisburseFundsToBusiness,BusinessToBusinessTransfer,MerchantToMerchantTransfer',
74-
'SenderIdentifierType' => 'required|string',
75-
'RecieverIdentifierType' => 'required|string',
70+
'OriginatorConversationID' => 'required',
71+
'Initiator' => 'required',
72+
'SecurityCredential' => 'required',
73+
'CommandID' => 'required|in:BusinessPayBill,BusinessBuyGoods,BusinessPayToBulk,DisburseFundsToBusiness,BusinessToBusinessTransfer,MerchantToMerchantTransfer',
74+
'SenderIdentifierType' => 'required',
75+
'RecieverIdentifierType' => 'required',
7676
'Amount' => 'required|numeric|min:0',
77-
'PartyA' => 'required|string',
78-
'PartyB' => 'required|string',
79-
'AccountReference' => 'required|string',
77+
'PartyA' => 'required',
78+
'PartyB' => 'required',
79+
'AccountReference' => 'required',
8080
'Requester' => 'nullable|phone_number',
81-
'Remarks' => 'required|string',
81+
'Remarks' => 'required',
8282
'QueueTimeOutURL' => 'required|url',
8383
'ResultURL' => 'required|url',
8484
]);
@@ -156,18 +156,18 @@ public function B2BRemitTax(
156156
'QueueTimeOutURL' => $queue_timeout_url ?? self::generateCallbackUrl(config('mpesa.b2b_timeout_url')),
157157
'ResultURL' => $result_url ?? self::generateCallbackUrl(config('mpesa.b2b_result_url')),
158158
], [
159-
'OriginatorConversationID' => 'required|string',
160-
'Initiator' => 'required|string',
161-
'SecurityCredential' => 'required|string',
162-
'CommandID' => 'required|string|in:PayTaxToKRA',
159+
'OriginatorConversationID' => 'required',
160+
'Initiator' => 'required',
161+
'SecurityCredential' => 'required',
162+
'CommandID' => 'required|in:PayTaxToKRA',
163163
'SenderIdentifierType' => 'required|in:4',
164164
'RecieverIdentifierType' => 'required|in:4',
165165
'Amount' => 'required|numeric|min:0',
166-
'PartyA' => 'required|string',
167-
'PartyB' => 'required|string',
168-
'AccountReference' => 'required|string',
166+
'PartyA' => 'required',
167+
'PartyB' => 'required',
168+
'AccountReference' => 'required',
169169
'Requester' => 'nullable|phone_number',
170-
'Remarks' => 'required|string',
170+
'Remarks' => 'required',
171171
'QueueTimeOutURL' => 'required|url',
172172
'ResultURL' => 'required|url',
173173
]);
@@ -222,13 +222,13 @@ public function B2BStkPush(
222222
'partnerName' => $partner_name ?? config('mpesa.partner_name') ?? config('mpesa.initiator_name'),
223223
'RequestID' => $request_reference_id ?? $this->generateOriginatorConversationId('B2B_STK_'),
224224
], [
225-
'primaryShortCode' => 'required|string',
226-
'receiverShortCode' => 'required|string',
225+
'primaryShortCode' => 'required',
226+
'receiverShortCode' => 'required',
227227
'amount' => 'required|numeric|min:0',
228-
'paymentRef' => 'required|string',
228+
'paymentRef' => 'required',
229229
'callbackUrl' => 'required|url',
230-
'partnerName' => 'required|string',
231-
'RequestID' => 'required|string',
230+
'partnerName' => 'required',
231+
'RequestID' => 'required',
232232
]);
233233

234234
if ($validator->fails()) {

‎src/Concerns/MpesaB2C.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ public function B2C(
5656
'ResultURL' => $result_url ?? self::generateCallbackUrl(config('mpesa.b2c_result_url')),
5757
'Occassion' => $occasion,
5858
], [
59-
'OriginatorConversationID' => 'required|string',
60-
'InitiatorName' => 'required|string',
61-
'SecurityCredential' => 'required|string',
59+
'OriginatorConversationID' => 'required',
60+
'InitiatorName' => 'required',
61+
'SecurityCredential' => 'required',
6262
'CommandID' => 'required|in:BusinessPayment,SalaryPayment,PromotionPayment',
6363
'Amount' => 'required|numeric|min:0',
64-
'PartyA' => 'required|string',
64+
'PartyA' => 'required',
6565
'PartyB' => 'required|phone_number',
66-
'Remarks' => 'required|string',
66+
'Remarks' => 'required',
6767
'QueueTimeOutURL' => 'required|url',
6868
'ResultURL' => 'required|url',
69-
'Occassion' => 'required|string',
69+
'Occassion' => 'required',
7070
]);
7171

7272
if ($validator->fails()) {

‎src/Concerns/MpesaBillManager.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function billManagerOptIn(
5757
'callbackurl' => 'required|url',
5858
'sendReminders' => 'integer|in:0,1',
5959
'logo' => 'nullable|url',
60-
'shortcode' => 'required|string',
60+
'shortcode' => 'required',
6161
]);
6262

6363
if ($validator->fails()) {
@@ -118,7 +118,7 @@ public function billManagerUpdateDetails(
118118
'callbackurl' => 'required|url',
119119
'sendReminders' => 'integer|in:0,1',
120120
'logo' => 'nullable|url',
121-
'shortcode' => 'required|string',
121+
'shortcode' => 'required',
122122
]);
123123

124124
if ($validator->fails()) {
@@ -174,16 +174,16 @@ public function billManagerSingleInvoicing(array $data): Response
174174
$this->generateToken();
175175

176176
$validator = self::validate($data, [
177-
'externalReference' => 'required|string',
178-
'billedFullName' => 'required|string',
177+
'externalReference' => 'required',
178+
'billedFullName' => 'required',
179179
'billedPhoneNumber' => 'required|phone_number_lax',
180-
'billedPeriod' => 'required|string',
181-
'invoiceName' => 'required|string',
180+
'billedPeriod' => 'required',
181+
'invoiceName' => 'required',
182182
'dueDate' => 'required|date',
183-
'accountReference' => 'required|string',
183+
'accountReference' => 'required',
184184
'amount' => 'required|numeric',
185185
'invoiceItems' => 'required|array',
186-
'invoiceItems.*.itemName' => 'required|string',
186+
'invoiceItems.*.itemName' => 'required',
187187
'invoiceItems.*.amount' => 'required|numeric',
188188
]);
189189

@@ -253,16 +253,16 @@ public function billManagerBulkInvoicing(array $data): Response
253253
$this->generateToken();
254254

255255
$validator = self::validate($data, [
256-
'*.externalReference' => 'required|string',
257-
'*.billedFullName' => 'required|string',
256+
'*.externalReference' => 'required',
257+
'*.billedFullName' => 'required',
258258
'*.billedPhoneNumber' => 'required|phone_number_lax',
259-
'*.billedPeriod' => 'required|string',
260-
'*.invoiceName' => 'required|string',
259+
'*.billedPeriod' => 'required',
260+
'*.invoiceName' => 'required',
261261
'*.dueDate' => 'required|date',
262-
'*.accountReference' => 'required|string',
262+
'*.accountReference' => 'required',
263263
'*.amount' => 'required|numeric',
264264
'*.invoiceItems' => 'required|array',
265-
'*.invoiceItems.*.itemName' => 'required|string',
265+
'*.invoiceItems.*.itemName' => 'required',
266266
'*.invoiceItems.*.amount' => 'required|numeric',
267267
]);
268268

@@ -306,12 +306,12 @@ public function billManagerReconciliation(
306306
'dateCreated' => $date_created,
307307
'accountReference' => $account_reference,
308308
], [
309-
'shortcode' => 'required|string',
310-
'transactionId' => 'required|string',
309+
'shortcode' => 'required',
310+
'transactionId' => 'required',
311311
'paidAmount' => 'required|numeric',
312312
'msisdn' => 'required|phone_number',
313313
'dateCreated' => 'required|date',
314-
'accountReference' => 'required|string',
314+
'accountReference' => 'required',
315315
]);
316316

317317
if ($validator->fails()) {
@@ -337,7 +337,7 @@ public function billManagerCancelSingleInvoicing(array $data): Response
337337
$this->generateToken();
338338

339339
$validator = self::validate($data, [
340-
'externalReference' => 'required|string',
340+
'externalReference' => 'required',
341341
]);
342342

343343
if ($validator->fails()) {
@@ -368,7 +368,7 @@ public function billManagerCancelBulkInvoicing(array $data): Response
368368
$this->generateToken();
369369

370370
$validator = self::validate($data, [
371-
'*.externalReference' => 'required|string',
371+
'*.externalReference' => 'required',
372372
]);
373373

374374
if ($validator->fails()) {

‎src/Concerns/MpesaC2B.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ public function ratiba(
104104
'TransactionDesc' => $description,
105105
'Frequency' => $frequency,
106106
], [
107-
'StandingOrderName' => 'required|string',
107+
'StandingOrderName' => 'required',
108108
'StartDate' => 'required|date:YMD',
109109
'EndDate' => 'required|date:YMD|after_or_equal:StartDate',
110-
'BusinessShortCode' => 'required|string',
111-
'TransactionType' => 'required|string',
112-
'ReceiverPartyIdentifierType' => 'required|string',
113-
'ReceiverPartyIdentifier' => 'required|string',
110+
'BusinessShortCode' => 'required',
111+
'TransactionType' => 'required',
112+
'ReceiverPartyIdentifierType' => 'required',
113+
'ReceiverPartyIdentifier' => 'required',
114114
'Amount' => 'required|numeric|min:0',
115115
'PartyA' => 'required|phone_number',
116116
'CallBackURL' => 'required|url',
117-
'AccountReference' => 'required|string',
118-
'TransactionDesc' => 'required|string',
117+
'AccountReference' => 'required',
118+
'TransactionDesc' => 'required',
119119
'Frequency' => 'required|in:1,2,3,4,5,6,7,8',
120120
]);
121121

‎src/Concerns/MpesaQRCode.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ public function generateQRCode(
4444
];
4545

4646
$validator = self::validate($data, [
47-
'MerchantName' => 'required|string',
47+
'MerchantName' => 'required',
4848
'Amount' => 'required|numeric|min:0',
49-
'RefNo' => 'required|string',
50-
'CPI' => 'required|string',
51-
'TrxCode' => 'required|string',
49+
'RefNo' => 'required',
50+
'CPI' => 'required',
51+
'TrxCode' => 'required',
5252
'Size' => 'required|integer',
5353
]);
5454

‎src/Concerns/MpesaStkPush.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function stkPush(
6363
// Validate the parameters
6464
$validator = self::validate([
6565
'BusinessShortCode' => $business_short_code ?? config('mpesa.shortcode'),
66-
'Password' => $this->generateStkPassword($shortcode ?? config('mpesa.shortcode'), $timestamp),
66+
'Password' => $this->generateStkPassword($business_short_code ?? config('mpesa.shortcode'), $timestamp),
6767
'Timestamp' => $timestamp,
6868
'TransactionType' => $transaction_type,
6969
'Amount' => $amount,
@@ -75,16 +75,16 @@ public function stkPush(
7575
'TransactionDesc' => $description,
7676
], [
7777
'BusinessShortCode' => 'required|numeric',
78-
'Password' => 'required|string',
78+
'Password' => 'required',
7979
'Timestamp' => 'required|date_format:YmdHis',
80-
'TransactionType' => 'required|string|in:CustomerPayBillOnline,CustomerBuyGoodsOnline',
80+
'TransactionType' => 'required|in:CustomerPayBillOnline,CustomerBuyGoodsOnline',
8181
'Amount' => 'required|numeric|min:0',
82-
'PartyA' => 'required|string',
83-
'PartyB' => 'required|string',
82+
'PartyA' => 'required',
83+
'PartyB' => 'required',
8484
'PhoneNumber' => 'required|phone_number',
8585
'CallBackURL' => 'required|url',
8686
'AccountReference' => 'required_if:TransactionType,CustomerBuyGoodsOnline|string',
87-
'TransactionDesc' => 'required|string',
87+
'TransactionDesc' => 'required',
8888
]);
8989

9090
if ($validator->fails()) {
@@ -120,9 +120,9 @@ public function stkPushQuery($checkout_request_id, ?string $shortcode = null): \
120120
// Validate the parameters
121121
$validator = self::validate($data, [
122122
'BusinessShortCode' => 'required|numeric',
123-
'Password' => 'required|string',
123+
'Password' => 'required',
124124
'Timestamp' => 'required|date_format:YmdHis',
125-
'CheckoutRequestID' => 'required|string',
125+
'CheckoutRequestID' => 'required',
126126
]);
127127

128128
if ($validator->fails()) {

‎src/Concerns/MpesaUtility.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ public function transactionStatus(
5252
'Remarks' => $remarks,
5353
'Occassion' => $occassion,
5454
], [
55-
'Initiator' => 'required|string',
56-
'SecurityCredential' => 'required|string',
57-
'CommandID' => 'required|string|in:TransactionStatusQuery',
58-
'TransactionID' => 'required|string',
59-
'OriginatorConversationID' => 'required|string',
60-
'PartyA' => 'required|string',
61-
'IdentifierType' => 'required|string',
55+
'Initiator' => 'required',
56+
'SecurityCredential' => 'required',
57+
'CommandID' => 'required|in:TransactionStatusQuery',
58+
'TransactionID' => 'required',
59+
'OriginatorConversationID' => 'required',
60+
'PartyA' => 'required',
61+
'IdentifierType' => 'required',
6262
'ResultURL' => 'required|url',
6363
'QueueTimeOutURL' => 'required|url',
64-
'Remarks' => 'required|string',
65-
'Occassion' => 'required|string',
64+
'Remarks' => 'required',
65+
'Occassion' => 'required',
6666
]);
6767

6868
if ($validator->fails()) {
@@ -110,15 +110,15 @@ public function checkBalance(
110110
'Remarks' => $remarks,
111111
'Occassion' => $occassion,
112112
], [
113-
'Initiator' => 'required|string',
114-
'SecurityCredential' => 'required|string',
115-
'CommandID' => 'required|string|in:AccountBalance',
116-
'PartyA' => 'required|string',
117-
'IdentifierType' => 'required|string',
113+
'Initiator' => 'required',
114+
'SecurityCredential' => 'required',
115+
'CommandID' => 'required|in:AccountBalance',
116+
'PartyA' => 'required',
117+
'IdentifierType' => 'required',
118118
'ResultURL' => 'required|url',
119119
'QueueTimeOutURL' => 'required|url',
120-
'Remarks' => 'required|string',
121-
'Occassion' => 'required|string',
120+
'Remarks' => 'required',
121+
'Occassion' => 'required',
122122
]);
123123

124124
if ($validator->fails()) {
@@ -171,17 +171,17 @@ public function reverseTransaction(
171171
'Remarks' => $remarks,
172172
'Occassion' => $occassion,
173173
], [
174-
'Initiator' => 'required|string',
175-
'SecurityCredential' => 'required|string',
176-
'CommandID' => 'required|string|in:TransactionStatusQuery',
177-
'TransactionID' => 'required|string',
178-
'OriginatorConversationID' => 'required|string',
179-
'ReceiverParty' => 'required|string',
180-
'ReceiverIdentifierType' => 'required|string',
174+
'Initiator' => 'required',
175+
'SecurityCredential' => 'required',
176+
'CommandID' => 'required|in:TransactionStatusQuery',
177+
'TransactionID' => 'required',
178+
'OriginatorConversationID' => 'required',
179+
'ReceiverParty' => 'required',
180+
'ReceiverIdentifierType' => 'required',
181181
'ResultURL' => 'required|url',
182182
'QueueTimeOutURL' => 'required|url',
183-
'Remarks' => 'required|string',
184-
'Occassion' => 'required|string',
183+
'Remarks' => 'required',
184+
'Occassion' => 'required',
185185
]);
186186

187187
if ($validator->fails()) {

0 commit comments

Comments
 (0)