Sync version 1.10.2 (#1312)

* Added new optimized assets

* Removed old svg files

* Updated escaping issues

* Image optimize add-ons page

* Added translation support in growth report

* Added offer notice for black friday

* Updated condition for showing promotional notice

* Fix/contact group subscriber bulk delete not working (#1308)

* changed section and added sub-section in from field

* fixed phpcs

* handled single value and array sanitization separately

* single value sanitization seems unnecessary, so removed it

* fix some phpcs

* Updated sanitizer according to type

Co-authored-by: Tanmay Kirtania <jktanmay@gmail.com>

* Fix/responsive issue in acc tables and invoice page (#1306)

* fix broken column on list-tables in Accounting module

* fixed responsive issue in invoice create and edit page

* fixed responsive issue in single sales content component

* fixed invisible Actions trigger button in small screen

* fixed invisible dropdown items by placing them in a horizontal list

* made the scroll bar invisible

* fixed some other table (like Tax) and removed ''.col--actions' from ListTable.vue(because of this css-class the action-trigger button becoming hidden in small screen)

* fix selector

* removed a debugging code snippet

* fixed wrong redirect after new amount-transfer

* fixed alignment of last column(account to) data

* fix code style

* move inline css to style section

* removed comment

* removed extra class

* removed extra css class

* make TrialBalance.vue responsive

* make LedgerReport.vue responsive

* make IncomeStatement.vue responsive

* make AgencyBased.vue responsive

* make CategoryBased.vue responsible

* make CustomerBased.vue responsible

* make TransactionBased.vue responsible

* make BalanceSheet.vue responsible

* made responsive Sales, Expense, Journals

* made Purchase related pages responsive

* made tables scroll horizontally

* made PayTaxSingle.vue responsive

* fixed LedgerReport to prevent single-row-expand expands all other rows

* show scroll bar on responsive fixed width tables

* show '-' if no customer name, trn_date or due_date is not available

* Enhance/auto entitle leave on employee type change (#1307)

* Fixed Department Parent Sorting Logic to fix redundant data (#1288)

* Fixed some data inconsistency for an employee

* Added promotional notice on halloween

* Removed temporary updater functionality

* Added prefix in date validation function name

* Updated date validation function

* Updated notice data

* fixed phpass not found by updating wp-browser dependencies (#1292)

* Fixed some data inconsistency for an employee

* fixed phpass not found by updating wp-browser dependencies

Co-authored-by: tanmayjay <jktanmay@gmail.com>

* Fix hrm crm acc manager import export not working (#1293)

* Fixed some data inconsistency for an employee

* fixed HRM, CRM, Accounting Manager can't export or import data.

* animated import form to top on import-error for better UX

* fix some coding style

* fix some coding style

Co-authored-by: tanmayjay <jktanmay@gmail.com>

* Fix/crm (#1297)

* Fixed some data inconsistency for an employee

* Fix: Issue with note section

* Fix: issue with Note section

Co-authored-by: Arif-me <islam.me85@gmail.com>

* Enhancement for CRM capabilities (#1301)

* hide 'Import Users' button from CRM Agent and check the permission in backend validation

* show only the CRM Agent in CSV Contact 'Import' if the current is CRM Agent

* fix typo

* fixed logical error so that CRM Agent Role can't mask CRM role

* update error message

Co-authored-by: Md. Abdulla Al Mamun <nayonabdulla@gmail.com>

* Fixed permission issue for csv export

* Updated permission check for  import/export option

* Updated permission for crm csv import

* Updated permission for company import export

* added leave settings for Auto Assign Leave Policy

* captured empoloyee type before update to use later

* took decision to call auto assign leave policy function on employee type change

* added function to auto assign available leave policy on employee type change

* sorted both collections in descending order and fixed some phpcs

* sorted both collections in descending order and fixed some phpcs

* sorted both collections in descending order and fixed some phpcs

* improved empty string check

* code refactor

* code refactor

* also updated leave_id in unpaid records

* showed more information on Available column

* showed more information on Available column

* Updated leave policy settings description

* Removed temp update file

* Refactored codebase

* Removed backtracked codes

Co-authored-by: Maniruzzaman Akash <manirujjamanakash@gmail.com>
Co-authored-by: tanmayjay <jktanmay@gmail.com>
Co-authored-by: Arif-me <islam.me85@gmail.com>

Co-authored-by: arif123456 <arif13414@gmail.com>
Co-authored-by: Md. Abdulla Al Mamun <nayonabdulla@gmail.com>
Co-authored-by: Maniruzzaman Akash <manirujjamanakash@gmail.com>
Co-authored-by: Arif-me <islam.me85@gmail.com>

assets/less/admin/responsive.less

@@ -239,5 +239,14 @@
             }
         }
     }
-}
 
+    div.wperp-table-responsive div.table-container, div.wperp-invoice-table {
+        width: 100% !important;
+        display: block !important;
+        overflow-x: auto !important;
+
+        > table {
+            width: 782px !important;
+        }
+    }
+}

includes/admin/views/add-ons.php

@@ -44,7 +44,7 @@
             flex-flow: inherit;
             justify-content: inherit;
         }
-        .erp_pro_addons_wrapper .box_item[class] {
+        .erp_pro_addons_wrapper .box_item[class], .erp_pro_addons_wrapper .why__erppro_wrap .box_item[class] {
             flex-basis: 100%;
             max-width: 100%;
             margin-bottom: 14px;
@@ -100,6 +100,7 @@
         .erp_pro_addons_wrapper .section_head[class] h2 {
             font-size: 26px;
             line-height: 35px;
+            display: inherit;
         }
 
         .premium_extension_section .premium_extension[class] {
@@ -112,6 +113,7 @@
 
         .erp_pro_addons_wrapper .say_hello_section[class] h3 {
             font-size: 20px;
+            margin-bottom: 0px;
         }
 
         .erp_pro_addons_wrapper .say_hello_section p {
@@ -236,7 +238,6 @@
         box-shadow: 0 4px 16px 0 rgba(0,38,85,0.05);
         border-radius: 8px;
         display: flex;
-        align-items: center;
         flex-basis: 376px;
         max-width: 376px;
         padding: 24px 0;
@@ -534,16 +535,23 @@
     .erp_pro_addons_wrapper .say_hello_section:before{
         content: "";
         position: absolute;
-        background: url(<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/say-hello-illustration.svg' ); ?>);
-        background-size: auto;
+        background: url(<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/say-hello-illustration.png' ); ?>);
+        background-size: contain;
         background-repeat: no-repeat;
-        background-position: top;
+        background-position: center;
         width: 100%;
-        height: 100%;
+        height: 183px;
         left: 0;
         z-index: -1;
     }
 
+    @media( max-width: 767px ) {
+        .erp_pro_addons_wrapper .say_hello_section:before{
+            height: 100%;
+        }
+
+    }
+
     .erp_pro_addons_wrapper .say_hello_section h3{
         font-size: 36px;
         color: #FFFFFF;
@@ -650,13 +658,13 @@
     <div class="erp_pro_addons_wrapper">
         <div class="banner_section">
             <div class="image-item">
-                <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/banner-image.svg' ); ?>" alt="">
+                <img width="383" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/banner-image.png' ); ?>" alt="">
             </div>
             <div class="details">
                 <a href="https://wperp.com/pro/" target="_blank" class="btn pro-btn">WP ERP Pro</a>
                 <h1><?php _e( 'The Ultimate Company<br>& Business Management<br>Solution', 'erp' ); ?></h1>
                 <div class="button-wrap">
-                    <a target="_blank" href="https://wperp.com/pricing/" class="btn get-started-btn"><?php _e( 'Get Started Now', 'erp' ); ?> <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/arrow-right.svg' ); ?>" alt=""></a>
+                    <a target="_blank" href="https://wperp.com/pricing/" class="btn get-started-btn"><?php _e( 'Get Started Now', 'erp' ); ?> <img width="12" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/arrow-right.png' ); ?>" alt=""></a>
                     <a target="_blank" href="https://wperp.com/demo/" class="btn try-demo-btn"><?php _e( 'Try Demo', 'erp' ); ?></a>
                 </div>
             </div>
@@ -671,7 +679,7 @@
             <div class="why__erppro_wrap">
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/gain-access.svg' ); ?>" alt="">
+                        <img width="200" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/gain-access.png' ); ?>" alt="">
                     </div>
                     <div class="desc">
                         <h3><?php _e( 'Gain access to nine powerful<br>extensions with a single purchase', 'erp' ); ?> </h3>
@@ -680,7 +688,7 @@
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/individual-extension.svg' ); ?>" alt="">
+                        <img width="180" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/individual-extension.png' ); ?>" alt="">
                     </div>
                     <div class="desc">
                         <h3><?php _e( 'Add other individual extensions<br>which suit your business', 'erp' ); ?></h3>
@@ -689,7 +697,7 @@
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/support-system.svg' ); ?>" alt="">
+                        <img width="170" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/support-system.png' ); ?>" alt="">
                     </div>
                     <div class="desc">
                         <h3><?php _e( 'Priority support <br>system', 'erp' ); ?></h3>
@@ -698,7 +706,7 @@
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/save-money.svg' ); ?>" alt="">
+                        <img width="214" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/save-money.png' ); ?>" alt="">
                     </div>
                     <div class="desc">
                         <h3><?php _e( 'Save money <br>User-based Pricing', 'erp' ); ?></h3>
@@ -754,49 +762,49 @@
             <div class="exclusive_feature_wrap">
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/hr-digest-email.svg' ); ?>" alt="">
+                        <img width="110" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/hr-digest-email.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'HR Email Digest<br>weekly/Monthly', 'erp' ); ?></h3>
                     <p><?php _e( 'Keep up to date with the latest in <br>HR news and trends with this <br> exclusive feature', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/crm-life-stage.svg' ); ?>" alt="">
+                        <img width="175" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/crm-life-stage.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'CRM Customizable<br>Life Stages', 'erp' ); ?></h3>
                     <p><?php _e( 'Try this feature now to customize <br>Customer life stages & prioritize <br>your work with them', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/crm-task-management.svg' ); ?>" alt="">
+                        <img width="180" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/crm-task-management.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'Task Management<br>in CRM', 'erp' ); ?></h3>
                     <p><?php _e( 'The feature lets you manage <br>tasks, collaborate among teams <br>and be super productive', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/sale-purchase-return.svg' ); ?>" alt="">
+                        <img width="190" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/sale-purchase-return.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'Sale and Purchase Returns', 'erp' ); ?></h3>
                     <p><?php _e( 'Creating sales & purchase returns<br>for your accounts is easier than ever<br>with WP ERP Accounting', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/work-from-home.svg' ); ?>" alt="">
+                        <img width="145" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/work-from-home.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'Work from Home', 'erp' ); ?></h3>
                     <p><?php _e( 'Digitize the process for requesting<br>work from home privileges as well as<br>the approval process', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/employee-resignation.svg' ); ?>" alt="">
+                        <img width="105" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/employee-resignation.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'Employee Resignation', 'erp' ); ?></h3>
                     <p><?php _e( 'Automate and simplify employee<br>resignation process using this feature<br>of WP ERP HR', 'erp' ); ?></p>
                 </div>
                 <div class="box_item">
                     <div class="image">
-                        <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/company-org-chart.svg' ); ?>" alt="">
+                        <img width="145" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/company-org-chart.png' ); ?>" alt="">
                     </div>
                     <h3><?php _e( 'Company Org Chart', 'erp' ); ?></h3>
                     <p><?php _e( 'Have your organizational structure<br>and define the flow of employees\'<br>work with this feature', 'erp' ); ?></p>
@@ -873,7 +881,7 @@
             <div class="say_hello_inner_section">
                 <h3><?php _e( 'Say Hello to WP ERP', 'erp' ); ?> <span><?php _e( 'Pro', 'erp' ); ?></span></h3>
                 <p><?php _e( 'And goodbye to papers, spreadsheets, wasted time,<br> uncertainty, frustration - run business smoothly.', 'erp' ); ?></p>
-                <a target="_blank" href="https://wperp.com/pro/"><?php _e( 'Get Started Now', 'erp' ); ?> <img src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/arrow-right.svg' ); ?>" alt=""></a>
+                <a target="_blank" href="https://wperp.com/pro/"><?php _e( 'Get Started Now', 'erp' ); ?> <img width="12" src="<?php echo esc_url( WPERP_ASSETS . '/images/wperp-addons/arrow-right.png' ); ?>" alt=""></a>
             </div>
         </div>
         <!-- end say hello section -->

includes/class-promotion.php

@@ -28,18 +28,22 @@ public function promotional_offer() {
             return;
         }
 
+        if ( ! isset( $_GET['page'] ) || 0 !== strpos( sanitize_text_field( wp_unslash( $_GET['page'] ) ), 'erp' ) ) {
+            return;
+        }
+
         $current_time      = erp_current_datetime()->setTimezone ( new \DateTimeZone( 'America/New_York' ) );
-        $promotion_start   = $current_time->setDate( 2021, 10, 21 )->setTime( 9, 0, 0 );
-        $promotion_end     = $current_time->setDate( 2021, 10, 31 )->setTime( 9, 0, 0 );
+        $promotion_start   = $current_time->setDate( 2021, 11, 05 )->setTime( 9, 0, 0 );
+        $promotion_end     = $current_time->setDate( 2021, 11, 30 )->setTime( 23, 59, 59 );
 
         // 2021-03-15 09:00:00 EST - 2021-03-22 23:59:59 EST
         if ( $current_time > $promotion_end || $current_time < $promotion_start ) {
             return;
         }
 
         if ( $current_time >= $promotion_start && $current_time <= $promotion_end ) {
-            $msg            = '<strong>Get Yourself a Spooky Delight!</strong></br>Enjoy up to <strong>35% OFF</strong> on <strong>WP ERP Pro</strong>.';
-            $option_name    = 'erp_halloween_offer_2021';
+            $msg            = 'Irresistible <strong>Black Friday</strong> & <strong>Cyber Monday</strong> Deals.</br>Enjoy up to <strong>45% OFF</strong> on <strong>WP ERP Pro</strong>.';
+            $option_name    = 'erp_black_friday_offer_2021';
 
             $this->generate_notice( $msg, $option_name );
             return;
@@ -62,7 +66,7 @@ public function generate_notice( $msg, $option_name ) {
         }
 
         $offer_msg = '<p class="highlight-text">' . sprintf( __( '%s', 'erp' ), $msg ) .
-                '</p><p><a style="padding:5px 15px;" target="_blank" href="https://wperp.com/pricing/?nocache&utm_medium=text&utm_source=wordpress-erp-halloween20212021">' . __( 'Get Now', 'erp' ) . '</a></p>';
+                '</p><p><a style="padding:5px 15px;" target="_blank" href="https://wperp.com/pricing/?nocache&utm_medium=text&utm_source=wordpress-erp-bfcm2021">' . __( 'Get Now', 'erp' ) . '</a></p>';
         ?>
         <div class="notice is-dismissible erp-promotional-offer-notice" id="erp-promotional-offer-notice">
             <?php echo wp_kses_post( $offer_msg ); ?>

includes/functions.php

@@ -882,7 +882,7 @@ function erp_months_dropdown( $title = false ) {
     }
 
     for ( $m = 1; $m <= 12; $m ++ ) {
-        $months[ $m ] = date( 'F', mktime( 0, 0, 0, $m, 1 ) );
+        $months[ $m ] = sprintf( __( '%s', 'erp' ), date( 'F', mktime( 0, 0, 0, $m, 1 ) ) );
     }
 
     return $months;

modules/accounting/assets/src/admin/components/bill/BillCreate.vue

@@ -55,8 +55,8 @@
                 <div class="table-container">
                     <table class="wperp-table wperp-form-table">
                         <thead>
-                        <tr>
-                            <th scope="col" class="col--id column-primary">{{ __('SL No', 'erp') }}.</th>
+                        <tr class="inline-edit-row">
+                            <th scope="col" class="col--id">{{ __('SL No', 'erp') }}.</th>
                             <th scope="col">{{ __('Account', 'erp') }}</th>
                             <th scope="col">{{ __('Description', 'erp') }}</th>
                             <th scope="col">{{ __('Amount', 'erp') }}</th>
@@ -65,8 +65,8 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr :key="key" v-for="(line, key) in transactionLines">
-                            <td scope="row" class="col--id column-primary">{{key+1}}</td>
+                        <tr :key="key" v-for="(line, key) in transactionLines" class="inline-edit-row">
+                            <td scope="row" class="col--id">{{key+1}}</td>
                             <td class="col--account with-multiselect"><multi-select v-model="line.ledger_id" :options="ledgers" /></td>
                             <td class="col--particulars"><textarea v-model="line.description" rows="1" maxlength="250" class="wperp-form-field display-flex" :placeholder="__('Particulars', 'erp')"></textarea></td>
                             <td class="col--amount" :data-colname="__('Amount', 'erp')">
@@ -79,25 +79,25 @@
                                 <a @click.prevent="removeRow(key)" href="#"><i class="flaticon-trash"></i></a>
                             </td>
                         </tr>
-                        <tr class="add-new-line">
+                        <tr class="add-new-line inline-edit-row">
                             <td colspan="9" style="text-align: left;">
                                 <button @click.prevent="addLine" class="wperp-btn btn--primary add-line-trigger"><i class="flaticon-add-plus-button"></i>{{ __('Add Line', 'erp') }}</button>
                             </td>
                         </tr>
 
-                        <tr class="total-amount-row">
-                            <td class="text-right pr-0 hide-sm" colspan="4">{{ __('Total Amount', 'erp') }}</td>
+                        <tr class="total-amount-row inline-edit-row">
+                            <td class="text-right pr-0" colspan="4">{{ __('Total Amount', 'erp') }}</td>
                             <td class="text-right" :data-colname="__('Total Amount', 'erp')">
                                 <input type="text" class="wperp-form-field text-right" name="finalamount" :value="moneyFormat(finalTotalAmount)" readonly disabled/></td>
                             <td class="text-right"></td>
                         </tr>
-                        <tr class="wperp-form-group">
+                        <tr class="wperp-form-group inline-edit-row">
                             <td colspan="9" style="text-align: left;">
                                 <label>{{ __('Particulars', 'erp') }}</label>
                                 <textarea v-model="particulars" rows="4" maxlength="250" class="wperp-form-field display-flex" :placeholder="__('Internal Information', 'erp')"></textarea>
                             </td>
                         </tr>
-                        <tr>
+                        <tr class="inline-edit-row">
                             <td>
                                 <div class="attachment-item" :key="index" v-for="(file, index) in attachments">
                                     <img :src="erp_acct_assets + '/images/file-thumb.png'">
@@ -109,7 +109,7 @@
                                 </div>
                             </td>
                         </tr>
-                        <tr class="add-attachment-row">
+                        <tr class="add-attachment-row inline-edit-row">
                             <td colspan="9" style="text-align: left;">
                                 <div class="attachment-container">
                                     <label class="col--attachement">{{ __('Attachment', 'erp') }}</label>