Version update

Reviewed-on: #2

CHANGELOG.md

@@ -0,0 +1,46 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.2] - 2023-07-20
+
+- Fixed typo in API call
+
+## [1.0.1] - 2023-06-26
+
+- Updates for production release
+
+## [1.0.0] - 2023-06-26
+
+- Security hardening changes to plugin queries.
+- Re-design of ZGo API callback to support WooCommerce 7.8.0
+
+## [1.0.0-beta.1] - 2023-01-11
+
+- Adjust production server integration
+
+## [1.0.0-beta] - 2023-01-09
+
+- Production server integration.
+- Monitor page look-and-feel enhancements.
+
+## [0.9.0] - 2023-01-03
+- Integrate ZGo Payments Monitor 
+
+## [0.8.0] - 2022-12-26
+- ZGo's WooCommerce backend API in test mode 
+- Set licence to GPL v2 or later
+
+## [0.5.0] - 2022-11-18
+- Integration to ZGo's Authentication End Point in test mode
+
+## [0.4.0] - 2022-11-18
+- Integration to ZGo's Authentication End Point in test mode
+
+## [0.2.0] - 2022-11-07
+- Initial alpha release
+- Uses test authentication and payment REST API ()
+
+
+

LICENSE.md

@@ -0,0 +1,86 @@
+GNU GENERAL PUBLIC LICENSE
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+    b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+    c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 

README.md

@@ -1,58 +1,27 @@
-# ZGo Payment Gateway plugin for Woocommerce
+# ZGo Payment Gateway plugin for WooCommerce
-
-Contributors: 
-Tags: WordPres, WooCommerce, payments, ecommerce, e-commerce, store, sales, sell, shop, shopping, cart, checkout
-Requires at least : Wordpress 6, WooCommerce 7
-Tested up to: WordPress 6.1.1, WooComerce 7.1,0
-Requires PHP: 7.1
-Stable tag: 1.0
 
 
-ZGo's payment processing solution for WooCommerce. This plugin implements a payment gateway to let buyers pay with Zcash
+ZGo's payment processing solution for WooCommerce. This plugin implements a payment gateway that allows WooCommerce sellers to accept Zcash as payment while using their existing shop setup.
 
-## Description
+Payments are sent directly to the seller's Zcash wallet, using shielded transactions.
 
-To Do
+## System Requirements
+
+- PHP 7.1
+- Wordpress 6
+- WooCommerce 7
 
 ## Installation
 
-1. Get your ZGo's OwnerID and Token for Woocommerce from your ZGo Shop Account
+1. Get your ZGo's OwnerID and Token for WooCommerce from your [ZGo shop settings](https://app.zgo.cash/).
-2. Download the `zgopmtggwy`  installation package from Gitlab???   `/wp-content/plugins/` directory.
+2. Download the latest `zgopmtgwy` installation package from the [Releases](https://git.vergara.tech/Vergara_Tech/ZGoPmtGwy/releases) page, the package signature and verify it.
-3. In WooCommerce Settings page go to the Payment Gateways tab, then click on "ZGo Payment", you will be redirected to ZGo Payment Settings page
+3. In the WooCommerce Settings page, go to the Plugins tab and click on `Add New`. Click the `Upload Plugin` button and upload the verified ZIP file. You will be redirected to the list of available plugins, now listing the ZGo Payment Gateway. Click on the `Activate` link to enable the plugin.
-4. Fill the ZGo OwnerId and ZGo Token fields 
+3. In the WooCommerce Settings page, go to the Payment Gateways tab, then click on "ZGo Payment", you will be redirected to ZGo Payment Settings page.
-5. Click "Save changes" and  return to WooCommerce Payments Tab
+4. Fill the ZGo OwnerId and ZGo Token fields.
+5. Click "Save changes" and  return to WooCommerce Payments Tab.
 6. Check "Enable" button. The credentials will be verified and the plugin will be activated if they are confirmed.
 
-## Usage
-
-To Do
-
 ## Support
 
-To Do
+- [ZGo User Support Chat](https://matrix.to/#/#zgo-support:vergara.tech)
 
-## Roadmap
-
-
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-
-To Do
-
-## License
-
-License: GPLv2
-License URI: http://www.gnu.org/licenses/gpl-2.0.html
-
-
-## Project status
-
-Development 

ZGoPmtGwy.md

@@ -1,34 +0,0 @@
-
-# Table of Contents
-
-#### What is ZGo Payment Gateway for *WooCommerce*
-#### How it Works?
-#### System Requirements
-#### Installing ZGo Payment Gateway
-
-## What is ZGo Payment Gateway for *WooCommerce*
-
-ZGo Payment Gateway for Woocomerce is a Plugin that allows a WooCommerce based online store, to receive payments using Zcash.
-
-The Plugin connects WooCommerce Online Store with ZGo Backend to provide customers with an easy way to pay using a phone wallet.
-
-## How it Works
-
-The payment flow is showed bellow:
-
-![ZGo PmtService Flow](ZGo_PmtGwy_Flow.png "ZGo PmtService Flow")
-
-Figure 1 – ZGo Payment GateWay Flow
-
-The payment flow showed in Figure 1, includes the transaction confirmation and also marking customer's order as paid in WooComerce store database. ZGo Backend monitors the payment transaction and once it detects at least 5 blockchain confirmations, will report this to ZGo Payment Plugin.
-
-## System Requirements
-
-ZGo Business Account
-
-WooComerce Based Online Store
-
-
-## ZGo Payment Gateway Installation 
-
-### Configuring WooCommerce Store

assets/php/zpmt-stats-page.php

@@ -0,0 +1,635 @@
+<?php
+/**
+* ZGo Payment Gateway for WooCommerce Plugin 
+*  
+* This class creates the statistics page for the plugin.
+*
+**/
+class zpmt_stats_page {
+
+	public $_limit;
+	public $_offset;
+	public $_npages;
+	public $_page;
+	public $_nrows;
+	public $_path;
+
+	public function __construct( $path ) {
+
+		global $wpdb;
+
+		$this->_path = $path;
+
+		$this->_nrows = $this->getPmtsCount(); 
+		//
+		// Create zgo_pmtlst if does not exist
+		//
+		$sql = 'create table if not exists zgo_pmtlst (' .
+	            'pg_ix integer ,' .
+	            'pg_page integer not null default 0,' .
+	            'pg_npages integer not null default 0,' .
+	            'pg_offset integer not null default 0,' .
+	            'pg_limit integer not null default 0,' .
+	            'pg_dt datetime default current_timestamp, '. 
+	            'unique lstix (pg_ix) );';
+		$wpdb->query($sql);
+
+		if ( ! $this->pmtLstRdy() ) {
+			//
+			// Calculate first time pagination paramters
+			// 
+			$this->_limit = 10;
+			$this->_page = 1;
+			$this->_offset = 0;
+			$this->_npages = intdiv($this->_nrows,$this->_limit);
+			if ( $this->_nrows > ($this->_npages*$this->_limit) ) {
+				$this->_npages++;
+			}
+
+//			$sql = 'insert into zgo_pmtlst (pg_ix,pg_page,pg_npages,pg_offset,pg_limit) values (1,' . 
+//				$this->_page . ',' .
+//				$this->_npages . ',' .
+//				$this->_offset . ',' .
+//				$this->_limit .')';
+
+			$sql =  $wpdb->prepare('insert into zgo_pmtlst (pg_ix,pg_page,pg_npages,pg_offset,pg_limit) values (1,%d,%d,%d,%d);',$this->_page,$this->_npages,$this->_offset,$this->_limit);
+			$wpdb->query($sql);
+		} else {
+	      	// Load last state
+	      	$params = $this->pmtLstParams();
+	      	$this->_page = $params->pg_page;
+	      	$this->_offset = $params->pg_offset;
+	      	$this->_limit = $params->pg_limit;
+	      	$this->_npages = $params->pg_npages;
+			if ( $this->_nrows > ($this->_npages*$this->_limit) ) {
+				//
+				// Calc new number of pages
+				//
+				$this->_npages = intdiv($this->_nrows,$this->_limit);
+				if ( $this->_nrows > ($this->_npages*$this->_limit) ) {
+						$this->_npages++;
+				}	
+
+//				$sql = 'update zgo_pmtlst set pg_npages=' . $this->_npages . ' where pg_ix=1';
+
+				$sql = $wpdb->prepare('update zgo_pmtlst set pg_npages=%d where pg_ix=1;',$this->_npages);
+				$wpdb->query($sql);
+			} 
+		}
+	}
+
+	public function getPmtsCount() {
+		global $wpdb;
+
+  	  	$sql = "select count(*) as npmts from zgo_payments";
+      	$result = $wpdb->get_var($sql);
+       	return $result;
+	}
+
+	public function pmtLstRdy() {
+		global $wpdb;
+      	$sql = 'select count(*) as nrecs from zgo_pmtlst;';
+      	$result = $wpdb->get_var($sql);
+      	return $result;
+	}
+
+	public function pmtLstParams() {
+		global $wpdb;
+      	$sql = 'select * from zgo_pmtlst where pg_ix=1;';
+      	$result = $wpdb->get_row($sql,OBJECT);
+		return $result;
+	}
+
+	public function console_log($data) {
+
+		$file =  $this->_path . 'assets/log/console.log'; 
+		file_put_contents($file, 'LST::' . $data . chr(0x0D) . chr(0x0A), FILE_TEXT | FILE_APPEND | LOCK_EX );
+	}
+
+	public function render() {
+		global $wpdb;
+
+     	$currentDate = date('Y-m-d H:i:s');
+
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+			//
+			// Navigation button pressed
+			//
+		    	$sql = 'select * from zgo_pmtlst where pg_ix=1;';
+		    	$result = $wpdb->get_row($sql,OBJECT);
+			$this->_page =  $result->pg_page;
+			$this->_limit =  $result->pg_limit;
+			$this->_npages =  $result->pg_npages;
+			$this->_nrows = $this->getPmtsCount();
+			if ( $this->_nrows > ($this->_npages*$this->_limit) ) {
+				$this->_npages = intdiv($this->_nrows,$this->_limit);
+				if ( $this->_nrows > ($this->_npages*$this->_limit) ) {
+					$this->_npages++;
+				}	
+			}
+
+			if ( isset($_POST['First'])) {
+				$this->_page = 1;			
+				$this->_offset = 0;
+			} 
+
+		   	if ( isset($_POST['Previous'])) {
+				if ($this->_page > 1) {
+					$this->_page--;
+				}
+				$this->_offset = $this->_limit*($this->_page-1);
+			} 
+
+			if ( isset($_POST['Next'])) {
+				if ($this->_page < $this->_npages ) {
+					$this->_page++;
+				}
+				$this->_offset = $this->_limit*($this->_page-1);
+			}
+
+			if ( isset($_POST['Last'])) {
+		   		$this->_page = $this->_npages;
+				$this->_offset = $this->_limit*($this->_page-1);
+			}
+			//
+			// Save new list state
+			//
+
+//			$sql = 'update zgo_pmtlst set pg_page=' . $this->_page .
+//			    ', pg_npages=' . $this->_npages .
+//			    ', pg_offset=' . $this->_offset . ' where pg_ix=1;';		
+			
+			$sql = $wpdb->prepare('update zgo_pmtlst set pg_page=%d, pg_npages=
+				%d, pg_offset=%d where pg_ix=1;',$this->_page,$this->_npages,$this->_offset);
+			$wpdb->query($sql);
+		}
+
+		?>
+		<div style="margin-top: 20px;
+		            font-family: Noto Sans;
+		            font-size: 30px;
+		            font-weight: 900;
+		            text-align: center;
+		            color: navy;">
+		<table>
+			<tr>
+				<td>
+				<img src= <?php echo '"' . get_site_url() . '/wp-content/plugins/zgopmtgwy/assets/img/zgowoo-icon.png"';
+	 			      ?>     
+
+	 			     style="width:50px;height:50px;"> 
+	 			</td>
+	 			<td>            
+					ZGo Payment Gateway - Received Payments
+				</td>
+			</tr>
+		</table>	
+		</div>	
+<!--	now output table header -->
+		<div width="100%" 
+           style="padding-right: 20px;">
+	    	<table width="100%">
+		    	<tr style="font-family: Noto Sans;
+					font-weight: 600;
+					font-size: 15px;
+					vertical-align: center;
+					height: 20px;
+		        		color: navy;">
+					<td width="50%" style="padding-left: 5px;">
+						<?php
+					  	  echo 'Page ' . $this->_page . '/' . $this->_npages; 
+						?>
+					</td>  
+					<td width="50%" style="text-align: right;"><?php echo $currentDate; ?>
+					</td>    	
+		      </tr>	
+		    	</table>     
+		    	<table>
+			   	<tr style="font-family: Noto Sans;
+						font-weight: 600;
+						font-size: 15px;
+						text-align: center;
+						vertical-align: center;
+						height: 20px;
+			         		background-color: #ff5722;
+			         		color: white;">
+					<td width="10%">ZGo Order Id</td>
+					<td width="10%">Shop Order Id</td>
+					<td width="15%">Customer</td> 
+					<td width="10%">Accepted</td> 
+					<td width="10%">Confirmed</td>
+					<td width="8%">Order Total</td>
+					<td width="8%">Rate</td>
+					<td width="8%">Total ZEC</td>
+					<td width="5%">Paid?</td>
+				</tr>
+
+		<?php
+
+		$sql = "select * from zgo_payments order by pmt_accepted desc  LIMIT " . $this->_offset . "," . $this->_limit;
+		$result = $wpdb->get_results($sql,OBJECT);
+		$npmts = count($result);
+		if (  $npmts > 0 ) {
+	   		$line = 0;
+		  	while ( $line < $npmts ) {
+		  		$row = $result[$line];
+		  		if ( fmod($line,2) ) {
+					print '<tr style="background-color: #ffffff;
+   		  	                font-weight: 600;">';
+		  		} else {
+					print '<tr style="background-color: #ebecf0;
+  		  	                font-weight: 600;">';
+				}
+				$line++;             
+				print '<td><a href="https://dev.zgo.cash/invoice/' . htmlentities($row->pmt_orderid, ENT_QUOTES) . '" target="_blank">' . htmlentities($row->pmt_orderid, ENT_QUOTES) . "</a></td>";
+				print "<td>" . htmlwntities($row->pmt_wc_order,ENT_QUOTES) . "</td>";
+				print "<td>" . htmlentities($row->pmt_wc_custname, ENT_QUOTES) . "</td>";
+				print '<td style="text-align:center;">'. htmlentities($row->pmt_accepted,ENT_QUOTES) . "</td>";
+				print '<td style="text-align:center;">'.htmlentities($row->pmt_confirmed,ENT_QUOTES) ."</td>";
+				print '<td style="text-align:right;">'. number_format($row->pmt_amount,2) . "</td>";
+				print '<td style="text-align:right;">'. number_format($row->pmt_rate,2) . "</td>";
+				print '<td style="text-align:right;">'. number_format($row->pmt_zec,8) . "</td>";
+				print '<td  style="text-align:center;">'. htmlentities($row->pmt_wc_paid,ENT_QUOTES) ."</td></tr>";
+			}
+		?> 
+			</table>
+			</div>
+		     <br>
+		     <form class="" action="" method="POST">
+		     	<table width="100%">
+			      	<tr>
+			      		<td width="10%"></td>
+			      		<td width="20%" align="center">	
+				         	<button type="submit" name="First" 
+				         	        style="border: 2px solid #ff2b00;
+		    								border-radius: 8px;
+		    								padding-left: 10px;
+		    								padding-right: 10px;
+		    								padding-top: 5px;
+		    								padding-bottom: 5px;
+		    								font-weight: 700;
+				           					background-color: #ff5722;
+		    								color: #ffffff;">First Page</button>
+				      	</td>
+			      		<td width="20%" align="center">	
+				         	<button type="submit" name="Previous" 
+				         	        style="border: 2px solid #ff2b00;
+		    								border-radius: 8px;
+		    								padding-left: 10px;
+		    								padding-right: 10px;
+		    								padding-top: 5px;
+		    								padding-bottom: 5px;
+		    								font-weight: 700;
+				           					background-color: #ff5722;
+		    								color: #ffffff;">Prev Page</button>
+				      	</td>
+			      		<td width="20%" align="center">	
+					         <button type="submit" name="Next" 
+				         	        style="border: 2px solid #ff2b00;
+		    								border-radius: 8px;
+		    								padding-left: 10px;
+		    								padding-right: 10px;
+		    								padding-top: 5px;
+		    								padding-bottom: 5px;
+		    								font-weight: 700;
+				           					background-color: #ff5722;
+		    								color: #ffffff;">Next Page</button>
+					      </td>   
+			      		<td width="20%" align="center">	
+				         	<button type="submit" name="Last" 
+				         	        style="border: 2px solid #ff2b00;
+		    								border-radius: 8px;
+		    								padding-left: 10px;
+		    								padding-right: 10px;
+		    								padding-top: 5px;
+		    								padding-bottom: 5px;
+		    								font-weight: 700;
+				           					background-color: #ff5722;
+		    								color: #ffffff;">Last Page</button>
+				      	</td>
+			      		<td width="10%"></td>
+			      	</tr>
+		     	</table>
+			</form>
+
+		<?php	
+			$this->render_stats();	
+			$this->render_totals();
+		}
+	}
+
+	public function render_stats() {
+
+		global $wpdb;
+
+		$sql = "select ifnull(a.dTotalAmount,0) as dTotalAmount, ifnull(a.dTotalZec,0) as dTotalZec, ifnull(a.dTotalPmts,0) as dTotalPmts, ifnull(b.wTotalAmount,0) as wTotalAmount, ifnull(b.wTotalZec,0) as wTotalZec, ifnull(b.wTotalPmts,0) as wTotalPmts, ifnull(c.mTotalAmount,0) as mTotalAmount, ifnull(c.mTotalZec,0) as mTotalZec, ifnull(c.mTotalPmts,0) as mTotalPmts from (select sum(a0.pmt_amount) as dTotalAmount, sum(a0.pmt_zec) as dTotalZec, count(*) as dTotalPmts from zgo_payments a0 where STR_TO_DATE(left(a0.pmt_confirmed,10), '%Y-%m-%d') = CURRENT_DATE ) a join (select sum(aa.pmt_amount) as wTotalAmount, sum(aa.pmt_zec) as wTotalZec, count(*) as wTotalPmts from zgo_payments aa where STR_TO_DATE(aa.pmt_confirmed, '%Y-%m-%d %H:%i:%s') >= DATE_SUB(CURRENT_DATE, INTERVAL 7 DAY)) b join (select sum(bb.pmt_amount) as mTotalAmount, sum(bb.pmt_zec) as mTotalZec, count(*) as mTotalPmts from zgo_payments bb where STR_TO_DATE(bb.pmt_confirmed, '%Y-%m-%d %H:%i:%s') >= DATE_SUB(CURRENT_DATE, INTERVAL 30 DAY)) c where 1;";
+		$result = $wpdb->get_row($sql,OBJECT);
+		?>
+		<div style="margin-top: 10px;
+				  margin-bottom: 10px;
+                      padding-right: 20px;
+		            font-family: 'Noto Sans';
+		            font-size: 20px;
+		            font-weight: 900;
+		            text-align: center;
+		            color: navy;">
+		   ZGo Confirmed Payments Statistics
+		</div>	
+<!--	now output table header -->
+     <table width="100%" 
+           style="padding-right: 20px;">
+         	<tr>
+         		<td width="10%"></td>
+	         	<td width="80%">	
+			    <table width="100%" >
+					<tr style="font-family: Noto Sans;
+				 		  	 font-weight: 600;
+							 font-size: 15px;
+							 margin: auto;
+							 text-align: center;
+							 vertical-align: center;
+							 height: 20px;
+						      background-color: #ff5722;
+						      color: white;">
+							<td width="35%">Payments received</td>
+							<td width="35%">Description</td>
+							<td width="30%">Value</td> 
+					</tr>
+				</table>
+			</td>
+         		<td width="10%"></td>
+		</tr>
+		<tr>
+	         	<td width="10%"></td>
+	         	<td width="80%" >	
+	         		<table width="100%">
+					<tr style="font-family: Noto Sans;
+							font-weight: 700;
+							background-color: white;">
+						<td width="35%" 
+							style="padding-left: 10px; 
+								border-top: 1px solid navy;
+								border-bottom: 1px solid navy;">Received Today</td>
+						<td width="35%">
+							<table width="100%" 
+								  style="border-top: 1px solid navy;
+									border-bottom: 1px solid navy;
+									border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;">Total Amount</td> 
+								</tr>
+								<tr>
+									<td style="border-top: 1px solid navy;
+										     padding-left: 10px;">Average Rate</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+									           padding-left: 10px;">Total Zec</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+										      padding-left: 10px;">Number of payments</td>
+								</tr>	
+							</table>	
+	 					</td>
+						<td width="30%">
+							<table width="100%"
+							     style="border-top: 1px solid navy;
+							    		  border-bottom: 1px solid navy;
+							    		  border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;"> <?php echo number_format($result->dTotalAmount,2);?></td> 
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+										padding-left: 10px;">
+										<?php 
+											if ($result->dTotalZec > 0.0) {
+												echo number_format($result->dTotalZec/$result->dTotalAmount,2);
+											} else { 
+												echo '0.00'; 
+											} 
+										?>
+									</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">
+										<?php 
+											echo number_format($result->dTotalZec,8);
+										?>
+									</td>
+								</tr>	
+								<tr >
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">
+										<?php 
+											echo $result->dTotalPmts;
+										?>
+									</td>
+								</tr>	
+							</table>	
+	 					</td> 
+					</tr>
+					<tr style="font-family: Noto Sans;
+							font-weight: 600;">
+						<td width="35%" 
+							style="padding-left: 10px; 
+								border-top: 1px solid navy;
+								border-bottom: 1px solid navy;">Last 7 days</td>
+						<td width="35%">
+							<table width="100%" 
+								style="border-top: 1px solid navy;
+									border-bottom: 1px solid navy;
+									border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;">Total Amount</td> 
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+									     padding-left: 10px;">Average Rate</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+										padding-left: 10px;">Total Zec</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+										padding-left: 10px;">Number of payments</td>
+								</tr>	
+							</table>	
+	 					</td>
+						<td width="30%">
+							<table width="100%" 
+							       style="border-top: 1px solid navy;
+									border-bottom: 1px solid navy;
+									border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;"> 
+										<?php 
+											echo number_format($result->wTotalAmount,2);
+										?>
+									</td> 
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+									           padding-left: 10px;"> 
+									     <?php 
+									     	if ($result->wTotalZec > 0.0) {
+												 echo number_format($result->wTotalAmount/$result->wTotalZec,2);
+											} else { 
+												echo '0.00'; 
+											} 
+										?>
+									</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+									           padding-left: 10px;">
+									     <?php 
+									     	echo number_format($result->wTotalZec,8);
+									     ?>
+									</td>
+								</tr>	
+								<tr >
+									<td style="border-top: 1px solid navy;
+									          padding-left: 10px;">
+									     <?php 
+									     	echo $result->wTotalPmts;
+									     ?>
+									</td>
+								</tr>	
+							</table>	
+	 					</td> 
+					</tr>
+					<tr style="font-family: Noto Sans;
+							font-weight: 600;
+							background-color: white;">
+						<td width="35%" style="padding-left: 10px; 
+										border-top: 1px solid navy;
+									     border-bottom: 1px solid navy;">Last 30 days
+						</td>
+						<td width="35%">
+							<table width="100%"
+							       style="border-top: 1px solid navy;
+									border-bottom: 1px solid navy;
+									border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;">Total Amount</td> 
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">Average Rate</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+									          padding-left: 10px;">Total Zec</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">Number of payments</td>
+								</tr>	
+							</table>	
+	 					</td>
+						<td width="30%">
+							<table width="100%"
+							       style="border-top: 1px solid navy;
+									border-bottom: 1px solid navy;
+									border-collapse: collapse;">
+								<tr>
+									<td style="padding-left: 10px;"> 
+										<?php 
+											echo number_format($result->mTotalAmount,2);
+										?>
+									</td> 
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;"> 
+										<?php 
+											if ($result->mTotalZec> 0.0) {
+												 echo number_format($result->mTotalAmount/$result->mTotalZec,2);
+											} else { 
+												echo '0.00'; 
+											} 
+										?>
+									</td>
+								</tr>	
+								<tr>
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">
+										<?php 
+											echo number_format($result->mTotalZec,8);
+										?>
+									</td>
+								</tr>	
+								<tr >
+									<td style="border-top: 1px solid navy;
+											padding-left: 10px;">
+										<?php 
+											echo $result->mTotalPmts;
+										?>
+									</td>
+								</tr>	
+							</table>	
+	 					</td> 
+					</tr>
+				</table>
+				</td>
+	         		<td width="10%"></td>
+			</tr>
+		</table>	
+		<?php
+	}
+
+	public function render_totals() {
+		global $wpdb;
+
+		$sql = 'select ifnull(sum(a.pmt_amount),0) as gTotalAmount, ' .
+			  'ifnull(count(*),0) as gTotalPmts, ' .
+			  'ifnull(sum(a.pmt_zec),0) as gTotalZec ' .
+		       'from zgo_payments a ' . 
+		       'where a.pmt_wc_paid = 1;' ;
+		$result = $wpdb->get_row($sql,OBJECT);
+		if ( $result ) {
+			if ($result->gTotalPmts > 0) {
+			?>
+				<div style="padding-right: 20px;
+				            font-family: 'Noto Sans';
+				            font-size: 15px;
+				            font-weight: 900;
+				            text-align: center;
+				            color: navy;">
+				   Global Totals
+				</div>	
+		     	<table width="100%" 
+	    				style="padding-right: 20px;">
+		        	<tr>
+			         <td width="10%"></td>
+			         <td width="80%">	
+							<table width="100%" >
+								<tr style="font-family: Noto Sans;
+								 		  	font-weight: 600;
+											font-size: 15px;
+											text-align: center;
+											vertical-align: center;
+											height: 20px;
+										   background-color: #ff5722;
+										   color: white !important;">
+									<td width="12%">Payments:</td>
+									<td width="23%"><?php echo $result->gTotalPmts ?></td>
+									<td width="12%">Total Amount:</td>
+									<td width="23%"><?php echo number_format($result->gTotalAmount,2) ?></td>
+									<td width="12%">Total ZEC:</td> 
+									<td width="23%"><?php echo number_format($result->gTotalZec,8) ?></td>
+								</tr>
+							</table>
+						</td>	
+			         <td width="10%"></td>
+					</tr>
+		      </table>   
+		     <?php   
+			} 
+		}
+	}
+}

assets/php/zpmt-stats.php

@@ -0,0 +1,31 @@
+<?php
+/**
+* ZGo Payment Gateway for WooCommerce Plugin 
+*  
+* This class creates the main statistics page for the plugin.
+*
+**/
+class zpmt_stats {
+
+	private $zpmtStatsPage;
+
+	public function __construct( $zpmtStatsPage ) {
+		$this->zpmtStatsPage = $zpmtStatsPage;
+	}
+
+	public function init() {
+		add_action( 'admin_menu', array( $this, 'add_options_page' ) );
+	}
+
+	public function add_options_page() {
+
+		add_management_page(
+			'ZGo Payment Gateway Support',
+			'ZGo Payments',
+			'manage_options',
+			'zgopmtlist',
+			array( $this->zpmtStatsPage, 'render' )
+		);
+	}
+
+}

changelog.md

@@ -1,18 +0,0 @@
-*** Changelog ***
-# ZGo Payment Plugin for WooCommerce
-
-## Version 0.8 - 2022-12-26
-ZGo's WooCommerce backend API in test mode 
-Set licence to GPL v2 or later
-
-## Version 0.5 - 2022-11-18
-integration to ZGo's Authentication End Point in test mode
-
-## Version 0.2 - 2022-11-07
-* Initial alpha release
-Uses test authentication and payent REST API ()
-
-## Version 0.4 - 2022-11-18
-integration to ZGo's Authentication End Point in test mode
-
-

zgopmtgwy.php

@@ -1,35 +1,35 @@
 <?php 
 /**
-* Plugin Name: ZGo Payment Gateway
+ * Plugin Name: ZGo Payment Gateway
-* Plugin URI: https://vergara.tech' 
+ * Plugin URI: https://zgo.cash/ 
-* Description: ZGo latest payment processing solution for Woocommerce. Accept payments using Zcash.
+ * Description: ZGo latest payment processing solution for Woocommerce. Accept payments using Zcash.
-* Version: 0.8
+ * Version: 1.1.1
-* Requires at least: 5.2
+ * Requires at least: 5.2
-* Requires PHP:      7.2
+ * Requires PHP:      7.2
-* Author: Vergara Tech LLC 
+ * Author: Vergara Tech LLC 
-* Author URI: https://vergara.tech
+ * Author URI: https://zgo.cash/
-* License:           GPL v2 or later
+ * License:           GPL v2 or later
-* License URI:       https://www.gnu.org/licenses/gpl-2.0.html
+ * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
-**/
+ **/
 
 if ( ! defined( 'ABSPATH' ) ) {
-    exit; // Exit if accessed directly
+	exit; // Exit if accessed directly
 }
 
 if ( ! in_array( 'woocommerce/woocommerce.php', 
-       apply_filters('active_plugins',
+	apply_filters('active_plugins',
-       get_option('active_plugins') ) ) ) {
+	get_option('active_plugins') ) ) ) {
 	return;
 }
 
 add_action( 'plugins_loaded', 'zgopmt_init' );
 function zgopmt_init() {
 
-    if ( ! class_exists( 'WC_Payment_Gateway' ) ) {
+	if ( ! class_exists( 'WC_Payment_Gateway' ) ) {
 
-       return;
+		return;
 
-    }
+	}
 
 	class WC_ZGopmt_Gateway extends WC_Payment_Gateway {
 
@@ -37,24 +37,20 @@ function zgopmt_init() {
 		public $zgoownerid;
 		public $zgotoken;
 		public $siteURL;
-      	public $zpmtdb; 
+		public $zpmtdb; 
 
-	   /**
+		/**
-	   * Constructor for the gateway.
+		 * Constructor for the gateway.
-	   */
+		 */
-	   public function __construct() {
+		public function __construct() {
 
-	   		global $wpdb;
+			global $wpdb;
-
+			// 
-		 	$this->console_log("Gateway constructor accesed.");
+			// Create payments table in WordPress database
-
+			//
-		 	$this->console_log('Create zgo_payments table if not exists...');
+			$sql = 'create table if not exists zgo_payments (' .
-		 	// 
+				'pmt_orderid varchar(64),' .
-		 	// Create payments table in WordPress database
+				'pmt_wc_order varchar(20),' .
-		 	//
-         	$sql = 'create table if not exists zgo_payments (' .
-                'pmt_orderid varchar(64),' .
-                'pmt_wc_order varchar(20),' .
 				'pmt_wc_custname varchar(100),' .
 				'pmt_accepted varchar(30),' .
 				'pmt_confirmed varchar(30),' .
@@ -63,15 +59,12 @@ function zgopmt_init() {
 				'pmt_zec double (12,8) not null default 0.0,' .
 				'pmt_wc_paid int not null default 0,' .
 				'unique pmt_orderix (pmt_orderid, pmt_wc_order) )';
-         	$this->console_log('Create table Query -> ' . $sql);
+			$wpdb->query($sql);
-         	$wpdb->query($sql);
-         	$this->console_log('zgopayments Table created in MySQL ...');
 
 			$iconurl = plugin_dir_url( __FILE__ ) . 
-			      'assets/zgo-icon-full_6pct.png'; 
+				'assets/img/zgo-icon-full_6pct.png'; 
 
 			$this->siteURL = get_site_url();
-			$this->console_log("Site URL: " . $this->siteURL);
 
 			$this->domain = 'zgopmtgwy';
 
@@ -79,9 +72,9 @@ function zgopmt_init() {
 			$this->icon = $iconurl; 
 			$this->has_fields = false;
 			$this->method_title = __('ZGo Payment', 
-				                     $this->domain);
+				$this->domain);
 			$this->method_description = __('ZGo Payment - Accept payments using Zcash.', $this->domain);
-         // Load the settings.
+			// Load the settings.
 			$this->init_form_fields();
 			$this->init_settings();
 
@@ -93,323 +86,427 @@ function zgopmt_init() {
 
 			// Actions
 			add_action('woocommerce_update_options_payment_gateways_' . 
-            			$this->id, 
+				$this->id, 
-            			array( $this, 'process_admin_options' ) );
+				array( $this, 'process_admin_options' ) );
 
-        	add_action( 'woocommerce_thankyou_' . $this->id, array( $this, 'thankyou_page' ) );
+			add_action( 'woocommerce_thankyou_' . $this->id, array( $this, 'thankyou_page' ) );
 
 			if ( ! $this->is_valid_for_use() ) 
 				$this->enabled = false;
+
 			/**
-			* Add the webhook for payment confirmation from ZGo
+			 * Add the webhook for payment confirmation from ZGo
-			*/
+			 */
-			add_action( 'woocommerce_api_zpmtcallback', array($this,'zconfirm'));	
+			//add_action( 'woocommerce_api_zpmtcallback', array($this,'zconfirm'));	
-	    }
+		}
+
+		public function register_routes() {
+			register_rest_route( 'wc/v3', 'zgocallback', array(
+				'methods' => 'GET',
+				'callback' => array($this,'zgoapicallback')));
+		}
 
 		public function init_form_fields() {
 
 			$this->form_fields = apply_filters( 
-				   'woo_zgopmtsrv_fields', array( 
+				'woo_zgopmtsrv_fields', array( 
-					  'enabled' => array(
+					'enabled' => array(
-	                    'title' => __('Enable/Disable', 
+						'title' => __('Enable/Disable', 
-	                                  $this->domain ),
+						$this->domain ),
-	                    'type' => 'checkbox',
+						'type' => 'checkbox',
-	                    'label' => __('Enable payments with Zcash', $this->domain ),
+						'label' => __('Enable payments with Zcash', $this->domain ),
-	                    'default' => 'yes'
+						'default' => 'yes'
-						),
+					),
-	                'title' => array(
+					'title' => array(
-	                    'title' => __( 'ZGo Payment Service title', 
+						'title' => __( 'ZGo Payment Service title', 
-	                    	$this->domain ),
+						$this->domain ),
-	                    'type' => 'text',
+						'type' => 'text',
-	                    'default' => __( 'ZGo Payment Gateway', 
+						'default' => __( 'ZGo Payment Gateway', 
-	                        $this->domain ),
+						$this->domain ),
-	                    'desc_tip' => true,
+						'desc_tip' => true,
-	                    'description' => __( 'Add a new title for the ZGo Payment Service that your customers will see when they are in the checkout page', 
+						'description' => __( 'Add a new title for the ZGo Payment Service that your customers will see when they are in the checkout page', 
-	                        $this->domain ),
+						$this->domain ),
-	                ),
+					),
-	                'description' => array(
+					'description' => array(
-	                    'title' => __( 'ZGo Payment Service Confirmation', 
+						'title' => __( 'ZGo Payment Service Confirmation', 
-	                    	$this->domain ),
+						$this->domain ),
-	                    'type' => 'textarea',
+						'type' => 'textarea',
-	                    'default' => __( '<b>Pay with Zcash</b>, ZGo will report your payment as soon as it gets confirmed. Normally it takes about 5 minutes.<br> <a href="https://zgo.cash" target="_blank">Read more...</a>', 
+						'default' => __( '<b>Pay with Zcash</b>, ZGo will report your payment as soon as it gets confirmed. Normally it takes about 5 minutes.<br> <a href="https://zgo.cash" target="_blank">Read more...</a>', 
-	                        $this->domain ),
+						$this->domain ),
-	                    'desc_tip' => true,
+						'desc_tip' => true,
-	                    'description' => __('Payment confirmation description that the customer will see on your checkout.', 
+						'description' => __('Payment confirmation description that the customer will see on your checkout.', 
-	                        $this->domain ),
+						$this->domain ),
-	                ),
+					),
-	                'instructions' => array(
+					'instructions' => array(
-	                    'title' => __('Instructions', 
+						'title' => __('Instructions', 
-	                    	$this->domain ),
+						$this->domain ),
-	                    'type' => 'textarea',
+						'type' => 'textarea',
-	                    'default' => __('Default instrctions', 
+						'default' => __('Default instrctions', 
-	                        $this->domain ),
+						$this->domain ),
-	                    'desc_tip' => true,
+						'desc_tip' => true,
-	                    'description' => __('Instruction that will be added to the Thank You page and order email', 
+						'description' => __('Instruction that will be added to the Thank You page and order email', 
-	                        $this->domain ),
+						$this->domain ),
-	                ),
+					),
-	                'zgoownerid' => array(
+					'zgoownerid' => array(
-	                    'title' => __( 'ZGo OwnerId', 
+						'title' => __( 'ZGo OwnerId', 
-	                    	$this->domain ),
+						$this->domain ),
-	                    'type' => 'text',
+						'type' => 'text',
-	                    'default' => __( ' ', 
+						'default' => __( 'Replace this text with your ZGo Owner ID ', 
-	                        $this->domain ),
+						$this->domain ),
-	                    'desc_tip' => true,
+						'desc_tip' => true,
-	                    'description' => __( 'Type or paste your ZGo Account Owner Id (Found in your ZGo Shop Settings)', 
+						'description' => __( 'Type or paste your ZGo Account Owner Id (Found in your ZGo Shop Settings)', 
-	                        $this->domain ),
+						$this->domain ),
-	                ),
+					),
-	                'zgotoken' => array(
+					'zgotoken' => array(
-	                    'title' => __( 'ZGo Token', 
+						'title' => __( 'ZGo Token', 
-	                    	$this->domain ),
+						$this->domain ),
-	                    'type' => 'text',
+						'type' => 'text',
-	                    'default' => __( ' ', 
+						'default' => __( 'Replace this text with your ZGo Token',
-	                        $this->domain ),
+						$this->domain ),
-	                    'desc_tip' => true,
+						'desc_tip' => true,
-	                    'description' => __( 'Type or paste your ZGo Token (Found in your ZGo Shop Settings)', 
+						'description' => __( 'Type or paste your ZGo Token (Found in your ZGo Shop Settings)', 
-	                        $this->domain ),
+						$this->domain ),
-	                ),
+					),
-	            )    
+				)    
 			);	
 		}
 
 		/*
-		* Check if configuration is valid
+		 * Check if configuration is valid
-		*/
+		 */
-	   	public function is_valid_for_use() {
+		public function is_valid_for_use() {
-	   	
-	   		$isvalid = false;
 
-		   	if ( isset($this->zgoownerid) && 
+			$isvalid = false;
-			     ($this->zgoownerid !== '') ) {
 
-				$url = 'https://test.zgo.cash/auth?ownerid=' .
+			if ( isset($this->zgoownerid) && 
-				   $this->zgoownerid . '&token=' .
+				($this->zgoownerid !== '') ) {
-				   $this->zgotoken . '&siteurl=' .
-				   $this->base64url_encode($this->siteURL);
 
-	        $this->console_log('URL -> ' . $url );
+				$url = 'https://api.zgo.cash/auth?ownerid=' .
+					$this->zgoownerid . '&token=' .
+					$this->zgotoken . '&siteurl=' .
+					$this->base64url_encode($this->siteURL);
 
-			$response =  wp_remote_get($url);  
-	        $this->console_log(json_encode($response));
-            
-			$httpcode = wp_remote_retrieve_response_code( $response );
-	        $this->console_log('Status Code -> ' . $httpcode );
 
-			switch ( $httpcode ) {
+				$response =  wp_remote_get($url);  
+
+				$httpcode = wp_remote_retrieve_response_code( $response );
+
+				switch ( $httpcode ) {
 				case 200:	
 					$body = wp_remote_retrieve_body( $response );
 					$oid = json_decode($body);
-					$this->console_log('Body -> ' . $body);
+					$isvalid = $oid->{'authorized'};
-	  				$isvalid = $oid->{'authorized'};
+					break;
-	  				break;
+				case 202:
-	  			case 202:
+					$body = wp_remote_retrieve_body($response );
-	  			    $body = wp_remote_retrieve_body($response );
 					$oid = json_decode($body);
-					$this->console_log('message -> ' . $oid->{'message'});
+					break;
- 					break;
 				default:
-					$this->console_log('Conection error..');
+					break;
-	  				break;
+				} 
-	 			} 
+			}
-	 		}
 			return $isvalid;
 		}
 
 		/*
-		* Process Payment
+		 * Process Payment
-		*/
+		 */
 		public function process_payment( $order_id ) {
 
 			global $wpdb;
 
-			$this->console_log('Site URL ->' . $this->siteURL);
-   			$this->console_log('Processing payment for order ' . $order_id);
-
 			$order = wc_get_order( $order_id );
-//   			$wc_order = wc_get_product($order_id);
+			//   			$wc_order = wc_get_product($order_id);
 			$wc_order_key = $order->get_order_key();
 
-			$this->console_log('Order ' . $order_id . ' key = ' . $wc_order_key);
 
-			$url = 'https://test.zgo.cash/woopayment' .
+			$url = 'https://api.zgo.cash/woopayment' .
 				'?ownerid=' . $this->zgoownerid . 
 				'&token='  . $this->zgotoken .
-  			    '&order_id=' . $order_id .
+				'&order_id=' . $order_id .
 				'&currency=' . strtolower($order->get_currency()) .
 				'&amount=' . $order->get_total() .
 				'&date=' . date_format($order->get_date_created(),'Y-m-d') .
-            	'&siteurl=' . $this->base64url_encode($this->siteURL) .
+				'&siteurl=' . $this->base64url_encode($this->siteURL) .
-            	'&orderkey=' . $wc_order_key;
+				'&orderkey=' . $wc_order_key;
 
-            	//'&orderkey=' . ;
+			//'&orderkey=' . ;
 
-			$this->console_log('ZGoPayment URL -> ' . $url);
-			$this->console_log('Calling wp_remote_get()');		
 			$response = wp_remote_get($url);
 			$httpcode = wp_remote_retrieve_response_code( $response );
 
-         	$this->console_log('Status Code ->' . $httpcode );
-
 			switch ( $httpcode ) {
-				case 200:
+			case 200:
-					wc_add_notice( 'Order on hold, please wait for confirmation');
+				wc_add_notice( 'Order on hold, please wait for confirmation');
-					$order->update_status('on_hold',__('Awaiting payment confirmation','woocommerce'));
+				$order->update_status('on_hold',__('Awaiting payment confirmation','woocommerce'));
-					$this->console_log('Order ' . $order_id . ' status set to ON_HOLD');
+				$body = wp_remote_retrieve_body( $response );
+				$oid = json_decode($body);
+				$zgoOrderid = $oid->{'order'};
+				$zgoOrderToken = $oid->{'token'};
+				// 
+				// Save ZGo Order ID and Cart order 
+				//
+				$sql3 = $wpdb->prepare('replace into zgo_payments (pmt_orderid, pmt_wc_order, pmt_wc_custname, pmt_accepted, pmt_confirmed, pmt_amount, pmt_rate, pmt_zec, pmt_wc_paid) values (%s, %s, %s, %s, %s, %f, 0, 0, 0);',
+					$zgoOrderid, $order_id, $order->get_billing_first_name() . ' ' . $order->get_billing_last_name(), date('Y-m-d H:i:s'), '', $order->get_total());
+				//$sql = "replace into zgo_payments (" .
+				//"pmt_orderid," .
+				//"pmt_wc_order," .
+				//"pmt_wc_custname," .
+				//"pmt_accepted," .
+				//"pmt_confirmed," .
+				//"pmt_amount," .
+				//"pmt_rate," .
+				//"pmt_zec," .
+				//"pmt_wc_paid) values ('" .
+				//$zgoOrderid . "','" .
+				//$order_id . "','" .
+				//$order->get_billing_first_name() . " " . 
+				//$order->get_billing_last_name() . "','" .
+				//date('Y-m-d H:i:s') . "','',".
+				//$order->get_total() . 
+				//",0,0,0)";
+				$wpdb->query($sql3);
 
-					$body = wp_remote_retrieve_body( $response );
+				// Remove cart.
-			        $this->console_log('res. body = ' . $body);
+				WC()->cart->empty_cart();
 
-					$oid = json_decode($body);
+				return array(
-	  				$zgoOrderid = $oid->{'order'};
+					'result' => 'success',
-			        $this->console_log('ZGo order = ' . $zgoOrderid);
+					'redirect' => 'https://app.zgo.cash/invoice/' . $zgoOrderid . '?token=' . $zgoOrderToken,
-			        // 
+				);
-			        // Save ZGo Order ID and Cart order 
+				break;
-			        //
+			case 202:
-			        $this->console_log("Preparing SQL insert statement");
+				$body = wp_remote_retrieve_body( $response );
-					$sql = "replace into zgo_payments (" .
+				$msg = json_decode($body);
-					      "pmt_orderid," .
+				$order->update_status('failed',__('Order ' . $order_id . ' -> ZGo Order Generation Error : '  . $msg->{'message'},'woocommerce'));
-					      "pmt_wc_order," .
-					      "pmt_wc_custname," .
-					      "pmt_accepted," .
-					      "pmt_confirmed," .
-					      "pmt_amount," .
-					      "pmt_rate," .
-					      "pmt_zec," .
-					      "pmt_wc_paid) values ('" .
-                    	  $zgoOrderid . "','" .
-                    	  $order_id . "','" .
-                    	  $order->get_billing_first_name() . " " . 
-                    	  $order->get_billing_last_name() . "','" .
-                       	  date('Y-m-d H:i:s') . "','',".
-                     	  $order->get_total() . 
-                     	  ",0,0,0)";
-                    $this->console_log($sql);
-                    $wpdb->query($sql);
 
-					// Remove cart.
+				break;		
-					WC()->cart->empty_cart();
+			default:
-
+				return;
-					$this->console_log($this->get_return_url( $order ));
-					
-					return array(
-					 	'result' => 'success',
-					    'redirect' => 'https://dev.zgo.cash/invoice/' . $zgoOrderid,
-					);
-					break;
-				case 202:
-					 $body = wp_remote_retrieve_body( $response );
-			         $this->console_log('res. body = ' . $body);
-
-					 $msg = json_decode($body);
-					 $this->console_log('Order ' . $order_id . ' -> ZGo Order Generation Error : '  . $msg->{'message'});
-
-					 $order->update_status('failed',__('Order ' . $order_id . ' -> ZGo Order Generation Error : '  . $msg->{'message'},'woocommerce'));
-
-					break;		
-				default:
-				  	return;
 			}
 		}	
 
 		/**
-		* Confirm payment and complete order
+		 * Confirm payment and complete order
-		*/
+		 */
-		public function zconfirm() {
+		//public function zconfirm() {
 
-	   		global $wpdb;
+			//global $wpdb;
-	   		
-			$this->console_log('zconfirm called ');
-			
-			$token = $_GET['token'];
-			$zgoOrderid =  $_GET['orderid'];
-			$orderid = $_GET['wc_orderid'];
-			$totalzec = $_GET['totalzec'];
-			$rate = $_GET['rate'];
-			$order = wc_get_order( $orderid );
 
-			$sql = "select * from zgo_payments where pmt_wc_order = '" . $orderid . "';";
+			//$token = $_GET['token'];
-			$this->console_log('SQL -> ' . $sql);
+			//$zgoOrderid =  $_GET['orderid'];
-			$result = $wpdb->get_row($sql,OBJECT);
+			//$orderid = $_GET['wc_orderid'];
-			if ( ! is_null($result) ) {
+			//$totalzec = $_GET['totalzec'];
+			//$rate = $_GET['rate'];
+			//$order = wc_get_order( $orderid );
 
-				$this->console_log('Query successfull...');
+			//$sql = $wpdb->prepare('select * from zgo_payments where pmt_wc_order = %s ;', $orderid);
-				$this->console_log('totalzec -> ', $totalzec);
+			////$sql = "select * from zgo_payments where pmt_wc_order = '" . $orderid . "';";
-				$this->console_log('rate -> ', $rate);
+			//$result = $wpdb->get_row($sql,OBJECT);
-				$this->console_log('pmt_wc_paid=' . $result->pmt_wc_paid);
+			//if ( ! is_null($result) ) {
-				$this->console_log('local token -> ' . $this->zgotoken);
-				$this->console_log('received token -> ' . $token);
-				$this->console_log('zgoOrderid -> ' . $zgoOrderid);
-				$this->console_log('pmt_orderid -> ' . $result->pmt_orderid);
 
-				if ( ( $token == $this->zgotoken )
+				//if ( ($token == $this->zgotoken )
-				     && ( $result->pmt_orderid == $zgoOrderid )
+					//&& ( $result->pmt_orderid == $zgoOrderid )
-				     && ( $result->pmt_wc_paid == '0' ) ) {      
+					//&& ( $result->pmt_wc_paid == '0' ) ) {      
-					$this->console_log('Test successfull...');
+					//switch ( $order->get_status() ) {
-					$this->console_log('Order status -> ' . $order->get_status());
+					//case 'pending':
-					switch ( $order->get_status() ) {
+					//case 'failed':
-						case 'pending':
+						//$order->payment_complete();
-						case 'failed':
+						//$order->reduce_order_stock();
-						   $this->console_log('Confirming payment for order ' . $orderid);
+						//// 
-							$order->payment_complete();
+						////  Mark order as completed in ZGo DB
-							$order->reduce_order_stock();
+						////
-					      	// 
+						////$sql = "update zgo_payments set " .
-					     	//  Mark order as completed in ZGo DB
+						////"pmt_confirmed='" . date('Y-m-d H:i:s') . 
-					      	//
+						////"', pmt_rate=" . $rate . 
-							$sql = "update zgo_payments set " .
+						////", pmt_zec=" . $totalzec .
-							   	"pmt_confirmed='" . date('Y-m-d H:i:s') . 
+						////", pmt_wc_paid=1 " .
- 					      		"', pmt_rate=" . $rate . 
+						////" where pmt_wc_order='" . $orderid . "';";
- 					      		", pmt_zec=" . $totalzec .
+						//$sql2 = $wpdb->prepare('update zgo_payments set pmt_confirmed = %s, pmt_rate = %f, pmt_zec = %f, pmt_wc_paid = 1 where pmt_wc_order = %s;', date('Y-m-d H:i:s'), $rate, $totalzec, $orderid );
-							   	", pmt_wc_paid=1 " .
+						//$wpdb->query($sql2);	
-							   	" where pmt_wc_order='" . $orderid . "';";
-/*
-		               		$this->zpmtdb->exec($sql);
-*/
-		               		$this->console_log($sql);
-		               		$wpdb->query($sql);	
-		               		$this->console_log('Order marked as paid in zgo_payments table...');
 
-							update_option('webhook_debug', $_GET);
+						//update_option('webhook_debug', $_GET);
-							break;
+						//break;
-						default:
+					//default:
-						   $this->console_log('Order ' . $orderid . ' already paid or cancelled...');
+						////$this->console_log('Order ' . $orderid . ' already paid or cancelled...');
-						   break;
+						//return array("message" => 'Order ' . $orderid . ' already paid or cancelled...');
-					} 
+						//break;
-				} else {
+					//} 
-					$this->console_log('Invalid parameters...');
+				//} else {
-				}
+					////$this->console_log('Invalid parameters...');
-			} else {
+					//return array("message" => 'Invalid parameters...');
-				$this->console_log('Database error...');
+				//}
-			}	
+			//} else {
-		}
+				////$this->console_log('Database error...');
+				//return array("message" => 'Database error...');
+			//}	
+		//}
 
 		public function thankyou_page () {
-	         if ( $description = $this->get_description() ) {
+			if ( $description = $this->get_description() ) {
-	             echo wpautop( wptexturize( $description ) );
+				echo wpautop( wptexturize( $description ) );
-	         }
+			}
 		}
 
 		public function console_log($data) {
 
-			$file = plugin_dir_path( __DIR__ ) . '/zgopmtgwy/assets/console.log'; 
+			$file = plugin_dir_path( __DIR__ ) . '/zgopmtgwy/assets/log/console.log'; 
 			file_put_contents($file, $data . chr(0x0D) . chr(0x0A), FILE_TEXT | FILE_APPEND | LOCK_EX );
- 
+
 		}
 
 		public function base64url_encode($data) {
 
-	        $edata = str_replace('=','',strtr(base64_encode($data), '+/', '-_'));
+			$edata = str_replace('=','',strtr(base64_encode($data), '+/', '-_'));
-  			return $edata;
+			return $edata;
+		}
+
+		public function zgoapicallback($request) {
+			global $wpdb;
+
+			//$token = $_GET['token'];
+			//$zgoOrderid =  $_GET['orderid'];
+			//$orderid = $_GET['wc_orderid'];
+			//$totalzec = $_GET['totalzec'];
+			//$rate = $_GET['rate'];
+			$token = $request->get_param('token');
+			$zgoOrderid = $request->get_param('orderid');
+			$orderid = $request->get_param('wc_orderid');
+			$totalzec = $request->get_param('totalzec');
+			$rate = $request->get_param('rate');
+			$order = wc_get_order( $orderid );
+
+			$sql = $wpdb->prepare('select * from zgo_payments where pmt_wc_order = %s ;', $orderid);
+			//$sql = "select * from zgo_payments where pmt_wc_order = '" . $orderid . "';";
+			$result = $wpdb->get_row($sql,OBJECT);
+			if ( ! is_null($result) ) {
+
+				if ( (hash('sha256',$token) == hash('sha256',$this->zgotoken) )
+					&& ( $result->pmt_orderid == $zgoOrderid )
+					&& ( $result->pmt_wc_paid == '0' ) ) {      
+					switch ( $order->get_status() ) {
+					case 'pending':
+					case 'failed':
+						$order->payment_complete();
+						$order->reduce_order_stock();
+						// 
+						//  Mark order as completed in ZGo DB
+						//
+						//$sql = "update zgo_payments set " .
+						//"pmt_confirmed='" . date('Y-m-d H:i:s') . 
+						//"', pmt_rate=" . $rate . 
+						//", pmt_zec=" . $totalzec .
+						//", pmt_wc_paid=1 " .
+						//" where pmt_wc_order='" . $orderid . "';";
+						$sql2 = $wpdb->prepare('update zgo_payments set pmt_confirmed = %s, pmt_rate = %f, pmt_zec = %f, pmt_wc_paid = 1 where pmt_wc_order = %s;', date('Y-m-d H:i:s'), $rate, $totalzec, $orderid );
+						$wpdb->query($sql2);	
+
+						//update_option('webhook_debug', $_GET);
+						return array('message' => 'Order '. $orderid . ' mark as paid correctly.');
+						break;
+					default:
+						//$this->console_log('Order ' . $orderid . ' already paid or cancelled...');
+						return array("message" => 'Order ' . $orderid . ' already paid or cancelled...');
+						break;
+					} 
+				} else {
+					//$this->console_log('Invalid parameters...');
+					return array("message" => 'Invalid parameters...');
+				}
+			} else {
+				//$this->console_log('Database error...');
+				return array("message" => 'Database error...');
+			}	
+			//return array( 'custom' => 'Data', "request" => $data->get_params() );
 		}
 
-    }
 
-	add_filter( 'woocommerce_payment_gateways', 
-	            'add_custom_gateway_class' );
-	function add_custom_gateway_class( $methods ) {
-		if ( ! in_array('WC_ZGopmt_Gateway', $methods) ) {
-	     $methods[] = 'WC_ZGopmt_Gateway';
-	   }  
-	   return $methods;
 	}
 
+	add_filter( 'woocommerce_payment_gateways', 
+		'add_custom_gateway_class' );
+	function add_custom_gateway_class( $methods ) {
+		if ( ! in_array('WC_ZGopmt_Gateway', $methods) ) {
+			$methods[] = 'WC_ZGopmt_Gateway';
+		}  
+		return $methods;
+	}
 
 }
+
+// Include the dependencies needed to instantiate the plugin.
+foreach ( glob( plugin_dir_path( __FILE__ ) . 'assets/php/*.php' ) as $file ) {
+	include_once $file;
+}
+
+add_action( 'plugins_loaded', 'zgopmtlist_plugin' );
+function zgopmtlist_plugin() {
+	$path = plugin_dir_path( __FILE__ );
+	$plugin = new zpmt_stats( new zpmt_stats_page($path) );
+	$plugin->init();
+
+}
+
+function get_custom($data) {
+	global $wpdb;
+
+	//$token = $_GET['token'];
+	//$zgoOrderid =  $_GET['orderid'];
+	//$orderid = $_GET['wc_orderid'];
+	//$totalzec = $_GET['totalzec'];
+	//$rate = $_GET['rate'];
+	$token = $data->get_param('token');
+	$zgoOrderid = $data->get_param('orderid');
+	$orderid = $data->get_param('wc_orderid');
+	$totalzec = $data->get_param('totalzec');
+	$rate = $data->get_param('rate');
+	$order = wc_get_order( $orderid );
+
+	$sql = $wpdb->prepare('select * from zgo_payments where pmt_wc_order = %s ;', $orderid);
+	//$sql = "select * from zgo_payments where pmt_wc_order = '" . $orderid . "';";
+	$result = $wpdb->get_row($sql,OBJECT);
+	if ( ! is_null($result) ) {
+
+		if ( ($token == $this->zgotoken )
+			&& ( $result->pmt_orderid == $zgoOrderid )
+			&& ( $result->pmt_wc_paid == '0' ) ) {      
+			switch ( $order->get_status() ) {
+			case 'pending':
+			case 'failed':
+				$order->payment_complete();
+				$order->reduce_order_stock();
+				// 
+				//  Mark order as completed in ZGo DB
+				//
+				//$sql = "update zgo_payments set " .
+				//"pmt_confirmed='" . date('Y-m-d H:i:s') . 
+				//"', pmt_rate=" . $rate . 
+				//", pmt_zec=" . $totalzec .
+				//", pmt_wc_paid=1 " .
+				//" where pmt_wc_order='" . $orderid . "';";
+				$sql2 = $wpdb->prepare('update zgo_payments set pmt_confirmed = %s, pmt_rate = %f, pmt_zec = %f, pmt_wc_paid = 1 where pmt_wc_order = %s;', date('Y-m-d H:i:s'), $rate, $totalzec, $orderid );
+				$wpdb->query($sql2);	
+
+				//update_option('webhook_debug', $_GET);
+				break;
+			default:
+				//$this->console_log('Order ' . $orderid . ' already paid or cancelled...');
+				return array("message" => 'Order ' . $orderid . ' already paid or cancelled...');
+				break;
+			} 
+		} else {
+			//$this->console_log('Invalid parameters...');
+			return array("message" => 'Invalid parameters...');
+		}
+	} else {
+		//$this->console_log('Database error...');
+		return array("message" => 'Database error...');
+	}	
+	//return array( 'custom' => 'Data', "request" => $data->get_params() );
+}
+
+function plugin_register_rest_apis() {
+	$zgoPlugin = new WC_ZGopmt_Gateway();
+	$zgoPlugin->register_routes();
+}
+add_action( 'rest_api_init', 'plugin_register_rest_apis');