Fix withdraw create date, fix get withdraw request responses, charge …

…amount when there is no charge
getdokan · Nov 20, 2023 · 52235e1 · 52235e1
1 parent 602176d
commit 52235e1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/assets/src/js/withdraw.js b/assets/src/js/withdraw.js
@@ -245,8 +245,8 @@
                 "select[name='withdraw_method'][id='withdraw-method'] option:selected"
             ).data();
             let chargeAmount = 0;
-
             let chargeText = '';
+
             if ( chargeFixed ) {
                 chargeText += accounting.formatMoney( chargeFixed, dokan.currency );
                 chargeAmount += chargeFixed;
@@ -261,6 +261,10 @@
                 chargeText += ` = ${ accounting.formatMoney( chargeAmount ) }`;
             }
 
+            if ( ! chargeText ) {
+              chargeText = accounting.formatMoney( chargeAmount, dokan.currency );
+            }
+
           Dokan_Withdraw.showWithdrawChargeHtml( chargeText, chargeAmount, withdrawAmount );
         },
 

diff --git a/includes/Withdraw/Manager.php b/includes/Withdraw/Manager.php
@@ -243,9 +243,9 @@ public function has_pending_request( $user_id ) {
      * @param integer $limit
      * @param integer $offset
      *
-     * @return array
+     * @return Withdraw[]
      */
-    public function get_withdraw_requests( $user_id = '', $status = 0, $limit = 10, $offset = 0 ) {
+    public function get_withdraw_requests( $user_id = '', $status = 0, $limit = 10, $offset = 0 ): array {
         // get all function arguments as key => value pairs
         $args = get_defined_vars();
 

diff --git a/includes/Withdraw/Withdraw.php b/includes/Withdraw/Withdraw.php
@@ -400,6 +400,17 @@ public function calculate_charge() {
         return $this;
     }
 
+    /**
+     * Returns withdraw data.
+     *
+     * @since DOKAN_SINCE
+     *
+     * @return array
+     */
+    public function get_data(): array {
+        return $this->data;
+    }
+
     /**
      * Create or update a withdraw
      *

diff --git a/templates/withdraw/pending-request-listing.php b/templates/withdraw/pending-request-listing.php
@@ -4,6 +4,8 @@
  *
  * @since   2.4
  *
+ * @var $withdraw_requests WeDevs\Dokan\Withdraw\Withdraw[]
+ *
  * @package dokan
  */
 
@@ -21,15 +23,15 @@
         <?php foreach ( $withdraw_requests as $request ) : ?>
 
             <tr>
-                <td><?php echo wp_kses_post( wc_price( $request->amount ) ); ?></td>
-                <td><?php echo esc_html( dokan_withdraw_get_method_title( $request->method, $request ) ); ?></td>
-                <td><?php echo esc_html( dokan_format_datetime( $request->date ) ); ?></td>
+                <td><?php echo wp_kses_post( wc_price( $request->get_amount() ) ); ?></td>
+                <td><?php echo esc_html( dokan_withdraw_get_method_title( $request->get_method(), $request->get_data() ) ); ?></td>
+                <td><?php echo esc_html( dokan_format_datetime( $request->get_date() ) ); ?></td>
                 <td>
                     <?php
                     $url = add_query_arg(
                         [
 							'dokan_handle_withdraw_request' => 'cancel',
-							'id'                            => $request->id,
+							'id'                            => $request->get_id(),
 						], dokan_get_navigation_url( 'withdraw-requests' )
                     );
                     ?>
@@ -39,9 +41,9 @@
                 </td>
                 <td>
                     <?php
-                    if ( $request->status === 0 ) {
+                    if ( $request->get_status() === 0 ) {
                         echo '<span class="label label-danger">' . esc_html__( 'Pending Review', 'dokan-lite' ) . '</span>';
-                    } elseif ( $request->status === 1 ) {
+                    } elseif ( $request->get_status() === 1 ) {
                         echo '<span class="label label-warning">' . esc_html__( 'Accepted', 'dokan-lite' ) . '</span>';
                     }
                     ?>