Skip to content

Commit

Permalink
Updates for Zikula 3.0. I also enhanced the testing features
Browse files Browse the repository at this point in the history
  • Loading branch information
@paustian
paustian committed Jan 22, 2021
1 parent 5169a56 commit 8fa0f84
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 38 deletions.
9 changes: 5 additions & 4 deletions Controller/SubscribeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class SubscribeController extends AbstractController {
private $response;
private $request;
private $listener;
private $debug = false;
private $debug = true;

/**
* @Route("")
Expand Down Expand Up @@ -72,7 +72,8 @@ public function indexAction() : Response {
*/
public function testsubscribeAction(Request $request) : Response {
if($this->debug){
return $this->render('@PaustianWebsiteFeeModule/Subscribe/websitefee_subscribe_testsubscribe.html.twig');
return $this->render('@PaustianWebsiteFeeModule/Subscribe/websitefee_subscribe_testsubscribe.html.twig',
['txnID' => bin2hex(random_bytes(8))]);
}
return new Response($this->render('@PaustianWebsiteFeeModule/Subscribe/websitefee_subscribe_index.html.twig'));
}
Expand Down Expand Up @@ -116,7 +117,7 @@ public function subscribepaypalAction(Request $request) : Response {
$this->_set_error($e->getMessage());
exit(0);
}
if ($verified) {
if ($verified || $this->listener->use_sandbox) {
$uid = $request->get('custom');
$txn_id = $request->get('txn_id');
$reciever_email = urldecode($request->get('receiver_email'));
Expand All @@ -140,7 +141,7 @@ public function subscribepaypalAction(Request $request) : Response {
} else {
//we have an invalid transaction, record it.
$this->response = $this->listener->getResponse();
$this->_set_error("Transaction not verified");
$this->_set_error("Transaction not verified.");

}
if($this->debug){
Expand Down
2 changes: 1 addition & 1 deletion Resources/views/Admin/websitefee_admin_modifyerrs.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<td>{{ item.wsfrequest }}</td>
<td>{{ item.wsfrespone }}</td>
<td>{{ item.wsferroeexp }}</td>
<td>{{ item.wsferrdate.date }}</td>
<td>{{ item.wsferrdate | date('Y-m-d') }}</td>
<td class="actions">
<a href="{{ path('paustianwebsitefeemodule_admin_deleteerror', {error: item.id}) }}" class="fas fa-trash" onclick="return confirm('Are you sure you want to delete this subscription information?')"></a>
</td>
Expand Down
66 changes: 33 additions & 33 deletions Resources/views/Subscribe/websitefee_subscribe_testsubscribe.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
{{ ("The WebsiteFeeModule Test Data" | trans) }}
</h3>
<form action="{{ path('paustianwebsitefeemodule_subscribe_subscribepaypal') }}" method="POST">
<p><input type="text" name="mc_gross" value="15.83" /></p>
<p><input type="text" name="protection_eligibility" value="Ineligible" /></p>
<p><input type="text" name="payer_id" value="GE6NU5SGDCX32" /></p>
<p><input type="text" name="tax" value="0.83" /></p>
<p><input type="text" name="payment_date" value="15:16:56 Jul 26, 2019 PDT" /></p>
<p><input type="text" name="payment_status" value="Completed" /></p>
<p><input type="text" name="charset" value="windows-1252" /></p>
<p><input type="text" name="first_name" value="Chongyang" /></p>
<p><input type="text" name="mc_fee" value="0.76" /></p>
<p><input type="text" name="notify_version" value="3.9" /></p>
<p><input type="text" name="custom" value="2" /></p>
<p><input type="text" name="payer_status" value="unverified" /></p>
<p><input type="text" name="business" value="[email protected]" /></p>
<p><input type="text" name="quantity" value="1" /></p>
<p><input type="text" name="verify_sign" value="APAjVwlJBZQE.C.Efo1DvVNrq0TBAMPKWkjoH03LbzSVYYNH8VipUllm" /></p>
<p><input type="text" name="payer_email" value="[email protected]" /></p>
<p><input type="text" name="txn_id" value="6UP50227XD3883217" /></p>
<p><input type="text" name="payment_type" value="instant" /></p>
<p><input type="text" name="last_name" value="Wang" /></p>
<p><input type="text" name="receiver_email" value="[email protected]" /></p>
<p><input type="text" name="payment_fee" value="0.76" /></p>
<p><input type="text" name="shipping_discount" value="0.00" /></p>
<p><input type="text" name="receiver_id" value="9CEJST87G36YE" /></p>
<p><input type="text" name="insurance_amount" value="0.00" /></p>
<p><input type="text" name="item_name" value="Why Microbes Matter" /></p>
<p><input type="text" name="discount" value="0.00" /></p>
<p><input type="text" name="mc_currency" value="USD" /></p>
<p><input type="text" name="item_number" value="11002" /></p>
<p><input type="text" name="residence_country" value="US" /></p>
<p><input type="text" name="shipping_method" value="Default" /></p>
<p><input type="text" name="transaction_subject" value="" /></p>
<p><input type="text" name="payment_gross" value="15.83" /></p>
<p><input type="text" name="ipn_track_id" value="3181950c29b47" /></p>
<p>Gross: <input type="text" name="mc_gross" value="15.83" /></p>
<p>Protection eligibility: <input type="text" name="protection_eligibility" value="Ineligible" /></p>
<p>payer ID:<input type="text" name="payer_id" value="GE6NU5SGDCX32" /></p>
<p>Tax:<input type="text" name="tax" value="0.83" /></p>
<p>Payment date:<input type="text" name="payment_date" value="15:16:56 Jul 26, 2019 PDT" /></p>
<p>Payment status:<input type="text" name="payment_status" value="Completed" /></p>
<p>Charset:<input type="text" name="charset" value="windows-1252" /></p>
<p>First Name:<input type="text" name="first_name" value="Chongyang" /></p>
<p>MC fee:<input type="text" name="mc_fee" value="0.76" /></p>
<p>Notify version:<input type="text" name="notify_version" value="3.9" /></p>
<p>Custom (User ID):<input type="text" name="custom" value="2" /></p>
<p>Payer Status: <input type="text" name="payer_status" value="unverified" /></p>
<p>Business paypal Email: <input type="text" name="business" value="[email protected]" /></p>
<p>Quantity: <input type="text" name="quantity" value="1" /></p>
<p>Verify Sign: <input type="text" name="verify_sign" value="APAjVwlJBZQE.C.Efo1DvVNrq0TBAMPKWkjoH03LbzSVYYNH8VipUllm" /></p>
<p>Payer Email:<input type="text" name="payer_email" value="[email protected]" /></p>
<p>Transaction ID<input type="text" name="txn_id" value="{{ txnID }}" /></p>
<p>Payment type:<input type="text" name="payment_type" value="instant" /></p>
<p>Last name:<input type="text" name="last_name" value="Wang" /></p>
<p>Receiver Email:<input type="text" name="receiver_email" value="[email protected]" /></p>
<p>Payment fee:<input type="text" name="payment_fee" value="0.76" /></p>
<p>Shiping discount:<input type="text" name="shipping_discount" value="0.00" /></p>
<p>Reciever id:<input type="text" name="receiver_id" value="9CEJST87G36YE" /></p>
<p>Insurance amount:<input type="text" name="insurance_amount" value="0.00" /></p>
<p>Item name:<input type="text" name="item_name" value="Why Microbes Matter" /></p>
<p>Discount:<input type="text" name="discount" value="0.00" /></p>
<p>MC currency:<input type="text" name="mc_currency" value="USD" /></p>
<p>Item Number<input type="text" name="item_number" value="110002" /></p>
<p>Residence country:<input type="text" name="residence_country" value="US" /></p>
<p>Shipping method:<input type="text" name="shipping_method" value="Default" /></p>
<p>Transaction subject:<input type="text" name="transaction_subject" value="" /></p>
<p>Payment gross:<input type="text" name="payment_gross" value="15.83" /></p>
<p>IPN track id:<input type="text" name="ipn_track_id" value="3181950c29b47" /></p>
<!-- here is the one you change to test different types -->
<!-- <input type="hidden" name="txn_type" value="subscr_cancel" /> -->
<p>Transaction Type</p>
Expand Down

0 comments on commit 8fa0f84

Please sign in to comment.