Thanks to visit codestin.com
Credit goes to github.com

Skip to content

new: integration of sweetalert2 for alert, prompt, confirm, toast notification#1364

Merged
nurul-umbhiya merged 7 commits intogetdokan:developfrom
abdulhadicse:feature/integration-of-sweetalert2
Oct 12, 2021
Merged

new: integration of sweetalert2 for alert, prompt, confirm, toast notification#1364
nurul-umbhiya merged 7 commits intogetdokan:developfrom
abdulhadicse:feature/integration-of-sweetalert2

Conversation

@abdulhadicse
Copy link
Contributor

@shohag121 shohag121 changed the title integration of sweetalert2 for alert, prompt, confirm integration of sweetalert2 for alert, prompt, confirm, toast notification Oct 5, 2021
@shohag121 shohag121 changed the title integration of sweetalert2 for alert, prompt, confirm, toast notification new: integration of sweetalert2 for alert, prompt, confirm, toast notification Oct 5, 2021
Copy link
Member

@shohag121 shohag121 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly review the code formating and consider the changes recommendation.

var attribute = $wrapper.data( 'taxonomy' );
var new_attribute_name = window.prompt( dokan.new_attribute_prompt );
let result = await dokan_sweet_alert( dokan.new_attribute_prompt, { action: 'prompt', input:'text', showCancelButton: true, confirmButtonColor: '#28a745', cancelButtonColor:'#dc3545' } );
var new_attribute_name = result.value;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also change it into let if possible.


if ( window.confirm( dokan.remove_attribute ) ) {
const isRemoved = await dokan_sweet_alert( dokan.remove_attribute, {
action :'confirm', showCancelButton:true, confirmButtonColor:'#28a745',cancelButtonColor: '#dc3545' } );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly Fix formatting

var $wrapper = $(this).closest( 'li.product-attribute-list' );
var attribute = $wrapper.data( 'taxonomy' );
var new_attribute_name = window.prompt( dokan.new_attribute_prompt );
let result = await dokan_sweet_alert( dokan.new_attribute_prompt, { action: 'prompt', input:'text', showCancelButton: true, confirmButtonColor: '#28a745', cancelButtonColor:'#dc3545' } );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly Fix formatting

dokan_seller_meta_boxes_order_items.block();

const isRefund = await dokan_sweet_alert( dokan_refund.i18n_do_refund, {
action : 'confirm', showCancelButton: true, confirmButtonColor:'#28a745',cancelButtonColor:'#dc3545' } );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix formatting.

*
* @return {Promise | bool} Return Promise on success, and false on failure
*/
async function dokan_sweet_alert( message = '' , options = {} ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kindly rename the function name as dokan_sweetalert because sweetalert us a library name.

const isRefund = await dokan_sweetalert( dokan_refund.i18n_do_refund, {
action : 'confirm',
showCancelButton: true,
confirmButtonColor:'#28a745',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider making the confirmButtonColor & cancelButtonColor optional but overridable. Manage a default value.

window.alert( response.error );
dokan_sweetalert( response.error, {
action : 'alert',
confirmButtonColor:'#28a745'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider making changes here

const isRemoved = await dokan_sweetalert( dokan.remove_attribute, {
action :'confirm',
showCancelButton:true,
confirmButtonColor:'#28a745',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider making changes here

@abdulhadicse abdulhadicse added Needs: Dev Review It requires a developer review and approval and removed Needs: Author Reply labels Oct 6, 2021
@nurul-umbhiya nurul-umbhiya added the Needs: Testing This requires further testing label Oct 7, 2021
@shohag121 shohag121 added Dev Review Done and removed Needs: Dev Review It requires a developer review and approval labels Oct 7, 2021
@Rink9 Rink9 added QA In Progress 🎉 QA Approved This PR is approved by the QA team and removed Needs: Testing This requires further testing QA In Progress labels Oct 7, 2021
} else {

alert('Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved.');
dokan_sweetalert( 'Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved.', {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in next release kindly try to make this string translateable

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

on second thought lets change this in this pr

$('.order_download_permissions').on('click', 'button.revoke_access', async function(e){
e.preventDefault();
var answer = confirm('Are you sure you want to revoke access to this download?');
const answer = await dokan_sweetalert( 'Are you sure you want to revoke access to this download?', {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kindly make this string translateable

$('.order_download_permissions').on('click', 'button.revoke_access', async function(e){
e.preventDefault();
var answer = confirm('Are you sure you want to revoke access to this download?');
const answer = await dokan_sweetalert( dokan_refund.i18n_download_permission, {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove dokan_refund and add the translatable script under $default_script variable in file: /plugins/dokan/includes/Assets.php, function: public function enqueue_front_scripts() {, line: 441
follow the same for below string also.

@nurul-umbhiya nurul-umbhiya merged commit e97ca6e into getdokan:develop Oct 12, 2021
nurul-umbhiya added a commit that referenced this pull request Nov 25, 2021
* add autologin

* Add autologin & set global setup guideline for Dokan Automation

* add new lines on scripts

* added changes on automation

* delete some files

* fix: flush rewrite rules after plugin is activated (#1260)

* fix: flush rewrite rules after plugin is activated
fix: flush rewrite rules after settings is saved

* update: added admin notice if wooCommerce is not activated or installed
update: moved rewrite related code into a separate function

* Feat/gernamized module (#1213)

* new: introduced a new action hook dokan_before_create_vendor
update: added a new parameter named $data for filter hook: dokan_vendor_create_data
fix: fixed id for vendor add/edit form fields

* new: introduced a new action hook dokan_user_profile_after_phone_number
new introduced a new action hook dokan_settings_after_store_phone

* new introduced a new action hook dokan_store_customizer_after_vendor_info

* new: added a new action hook named dokan_settings_before_store_email on vendor dashboard store settings page

* new: added a new action hook named dokan_seller_registration_after_shopurl_field on vendor registration pages

* fix: dokan_product_gallery_image_count action added (#1269)

* update: hide create and add new button if only one product creation allowed (#1265)

* update: hide create and add new button if only one product allowed

* refactor: create and add new button show condition

* add: dokan summer sale promotion 2021 (#1271)

* fix: create and add new button display condition (#1272)

* fix: create and add new button display condition

* update: strict condition check for remaining product count 1

* update: condition check for remaining product count 1

* chore: Bump version to 3.2.8

* adding a filter to modify the order item's price when calculating earnings for the ordered item. (#1275)

Co-authored-by: Nurul Umbhiya <[email protected]>

* fix: Product tag search not working in variable product (#1273)

* new: Add customize for store product filter option hide (#1274)

* fix: display shipping widget though virtual checkbox selected (#1218)

* fix: display shipping widget though virtual checkbox selected

* refactor: show hide panel for virtual product on page load

* Fix children on product get_item (#1277)

* fix: fixed a js error while refunding from vendor dashboard: size() is not a function

* chore: Bump version to 3.2.9

* hide customer information from vendor order export based on setting (#1284)

* hide customer information from vendor order export based on setting

* phpcs errors fixed in includes/Order/Hooks.php

* priority and expected argument count added on dokan_csv_export_headers filter hook

* Category name order by ascending (#1255)

* Category name order by ascending

* revert unnecessary changes

* category name ascending order for multiple select dropdown

* Fix: After submitting the Create Product from the selected category is not selected (#1278)

* After submitting the Create Product from the selected category is not selected.

* Remove array type casting

* Make sure selected args are array

* chore: Bump version to 3.2.10

* fixed conflict

* Fixed Conflict

* Fixed Conflict

* new: Stores listing orderby random (#1287)

* new: Stores listing orderby random

* - Requested changes fixed

* Feat/add booking (#1291)

* add: guest checkout support on customer column

* update: i18n

* update: text domain

* fix: Fatal error when vendor registration shortcode use on api issue fixed (#1292)

* Map api source selection - show corresponding field (#1293)

* new: Texty added on dokan recommended plugins (#1294)

* new: Texty added on dokan recommended plugins

* - Requested changes fixed

* Vendor filter added on Withdraw page (#1296)

* Vendor filter added on Withdraw page

* withdraw status tab active fixed

* text-domain fixed

* New Rest Route To Get Corresponding Vendors Product Categories Under StoreController (#1290)

* new: added a new method named get_published_products() under Vendor class to get all published products of a vendor
new: added a new method named get_store_categories() under Vendor class to get all published products assigned categories
new: added a new rest route name id/categories under StoreController to get corresponding vendors published product categories

* update: store category cache related code updates

* update: delete store category cache for vendors after a product category is updated

* update: rewritten function dokan_store_category_menu(), now store category will only display if published products is available on that category

* update: added category extra information

* new: added get_best_selling_products() method under Vendor class
new added best selling products category support under get_store_categories() in Vendor class
new: added popular category support under StoreController rest api

* update: fixed a warning

* update: renamed 'Dokan: Store Category Menu' with 'Dokan: Store Product Category Menu'
fix: deleted category was displaying

* Added REST API request for Withdraw Create Request - Fixed #1198 (#1301)

* Fixed unable to remove downloadable file (#1303)

* update: rewritten function dokan_get_seller_id_by_order() and dokan_get_seller_id_by_order(), also updated references of these functions (#1306)

fix: fixes fatal error with delete product order fixes #1414

* new: What's new button added on wp-admin dokan page to bar (#1308)

* chore: Bump version to 3.2.11

* new: added a new filter hook named dokan_suborder_notice_to_customer to change suborder notice to customer

* update: updated dokan_suborder_notice_to_customer filter

* Fix/js deprecated warnings (#1304)

* refactor: .click replaced with .on("click") and .trigger() (#1299)

* Fix/dokan js deprecated warnings (#1300)

* fix: jQuery.fn.change() event shorthand is deprecated

* fix:  jQuery.fn.bind() event shorthand is deprecated

* Fix/js deprecated check (#1312)

* fix: keypress deprecated warning

* fix: keyup deprecated warning

* fix: keyup, keydown deprecated warning

* fix: .size deprecated warning

Co-authored-by: Shazahanul Islam Shohag <[email protected]>
Co-authored-by: Zabir Ahmed Anik <[email protected]>

* fixed: dokan_store_name meta missing (#1313)

* fixed: dokan_store_name meta missing

* DokanUpgrader version renamed

* phpcs fixed

* fixed: Single store page map hide based on setting (#1314)

* update: filter added for Order status list allowed for withdrawal (#1318)

* new: Vendor settings update REST api #1192 (#1319)

* new: Vendor settings update REST api #1192

* - Some warnings fixed

* - Requested changes fixed

* - Requested changes fixed

* - Fixed some phpcs errors

* new: Withdraw details keep save as log (#1321)

* new: Withdraw details keep save as log

* - Requested changes fixed

* - Fixed PHPCS errors

* chore: Bump version to 3.2.12

* Fix: Check if pagination_base post is empty (#1315)

* Fix: Check if pagination_base post is empty

Found bug when activating ElasticPress, and tried to index.

* Fix: Correct the formatting issues

* fix: fixed warning on product listing page due to filter data type mismatch (#1326)

* Feat/store location pickup (#1286)

* add: seller address field for store location pickup

* add: new filter dokan_store_profile_settings_args

* update: check for dokan class

* fix: Export order permission for staffs (#1352)

* update: added dynamic filter named: dokan_manage_shop_order_custom_columns_%s hook under shop_order_custom_columns method, also rewritten this function (#1354)

* feat: Set limitation for how many product tags that vendor can input (#1329)

* feat: Set limitation for how many product tags that vendor can input

* feat: Set limitation for how many product tags that vendor can input

* feat: Set limitation for how many product tags: maximum 0 setting update

* feat/ product tag add limitaion phpcs fix and filter rename

Co-authored-by: Nurul Umbhiya <[email protected]>

* fix: Single store product search not working for loggedout users (#1351)

* Fix/localization issue attribute label (#1344)

* fix: Translation issue fixed on product edit page

* - phpcs errors fixed

* chore: Bump version to 3.2.13

* Extend the function `dokan_get_page_url` to accept `$subpage` as an (… (#1360)

* Extend the function `dokan_get_page_url` to accept `$subpage` as an (#1195)

extra parameter

- Introduced a new function `dokan_add_subpage_to_url` to avoid the
repetitive issues due to incorrect path concatenation.
- Added- the new subpage argument in the filter hook.

getdokan/dokan-wpml#13

* update: added short description for function dokan_add_subpage_to_url()

Co-authored-by: Pierre <[email protected]>

* chore: Bump version to 3.2.14

* refactor simple product

* refactor helper file

* Refactor Locator file

* Fix: Vendor earning calculation with tax (#1330)

* Fix: Vendor earning calculation with tax

* Added vendor earning info tooltip

* Restore vendor earning functionlaity

* added: localization support for text "Calculating" (#1333)

* added: localization support for text "Calculating"

* spacing fixed

* calculating text localization

* fix/vendor-info (#1338)

* fix/vendor-info

* fix phpcs errors

* update: Filter hook added for store banner size (#1353)

* Feat: Filter hook for store banner size

* Update: Make necessary changes as requested

Make two different functions for two different filter hooks. And other changes have been made.

fix #1353

* Update: Update filter function

Make filter function optimized.

fix #1353

* Update: Remove unnecessary dock block

Unnecessary dock block is removed.

fix #1353

* Fix: Selected tags missing when form has any validation error (#1356)

* Fix: Selected tags missing when has any form vailidation error

* Changed veriable name

* Changed variable name

* fix: Store Address input fields are missing in store setting form (#1361)

* Fix: Store product category translation support for WPML (#1363)

* Fix: Store product category translation support for wpml

* Used method directly insted of variable assign

* refactor: Transient key assigned to veriable

* Refector: Conditional statements refectored

* Delete transient for all active languages

* fix/withdraw-limit-amount-validation (#1336)

* fix/withdraw-limit-amount-validation

* modified code

* vendor wizard withdraw amount validation

* change dokan lite since version doc

* modified code and show validation error message

* move code functions.php file to settings.php file

Co-authored-by: Nurul Umbhiya <[email protected]>

* fix: dokan product view cache plugin/system bug (#1337)

* fix: cache plugin/system bug

* update logic.

* spelling corrected.

* logic improved

* spacing indentation resolved.

* updated.

* fix: corrected spelling to 'picture' from 'picutre' (#1368)

* Fix: Load Divi theme assets when product is empty in store page (#1369)

* Fix: Load Divi theme assets when product is empty in store page

* Updated phpcs and since document

* Updated long to short array

* Update profile

* remove wp_reset_post for not necessary

Co-authored-by: unknown <[email protected]>

* Feat: Added dokan stores menu in admin bar (#1345)

* Feat: Added dokan stores menu in admin bar

* Update vendor stores menu title

* Solved previous problems

* Update Indentation Problem

* Solved double checking problem

* Solved reviewed problems

* Solved reviewed problem

* Solved previous problems

* change function spell

* solved previous problems

* [Feat] Dokan data clear on plugin delete (#1362)

* added: Dokan Data clear setting in Admin General settings

* added: Dokan Uninstaller file

* phpcs fixed

* update desc of data clear setting

* warning message changed of Data clear setting

* DOKAN_LITE_SINCE replaced with version 3.2.14

* fixed: data_clear setting not saving

* since 3.2.14 changed to 3.2.15

* alert message changed for data clear

* wp_roles() function used

* `dokan_get_all_caps` function used for get all capabilities

* dokan page force delete after uninstall

* capabilities from different modules added on list for removing when uninstalling

* phpcs fixed

* removed vendor_staff role

* feat: Detect location for pro module (#1350)

* feat: Detect location for pro module

* Feat: Detect geolocation improve

* new: integration of sweetalert2 for alert, prompt, confirm, toast notification (#1364)

* integration of sweetalert2 for alert, prompt, confirm

* fix code formatting

* fix css style and modify code

* code modified and delete style file

* add alert and confirm modal orders.js file

* fix string translateable

* remove dokan_refund and add the translatable script under $default_script variable

* Fix: Vendor Contact form doesn't contain customer email (#1349)

* Fix: Vendor Contact form doesn't contain customer email when vendor reply

* style: change array indentation

* docs: Added veriable doc block

* doc: added @SInCE in doc block

* Change function return type mixed to string

* Implement get_from_name and get_from_address instead of reply_to method

* Removed get_from_name method

* update: halloween sale 2021 (#1373)

* new: added a new method named dokan_get_timestamp() to convert datetime string into timestamp with GMT date support (#1374)

* new: added a new method to named dokan_get_post_timestamp() to convert datetime string into timestamp with GMT date support

* update: renamed function to dokan_get_timestamp()

* chore: Bump version to 3.2.15

* refactor simple product script

* refactor helper script

* refactor locator script

* feat: Admin coupons apply for vendors (#1254)

* feat: Admin coupons apply for vendors

* - Fixed cart coupon validation added with multi-vendor

* - Some sentence changed

* - Some codes optimized

* - Resolved some issues

* - Product based discount conflicting issue fixed

* - Some new logic apply

* - Some spacing issue fixed

* - Some parameters changed

* - Product restriction issue fixed

* - Order discount deduct from item total before comission calculations

* - Requested review issues fixed

* - Some structure changed

* - Some optimized on codes

* Added id in update product button (#1347)

* Fix: Typo in vendor earning tooltip. (#1380)

* feat/bulk edit option for products (#1357)

* feat/bulk_edit_option_for_products

* update validation.

* added $id parameter in dokan_get_vendor_by_product()

* add a method dokan_array_insert_after

* add return param for dokan_get_vendor_by_product

* type casting to dokan_get_vendor_by_product

Co-authored-by: Nurul Umbhiya <[email protected]>

* update:send_order_status_notification_to_vendor_when_order_status_change_from_cancelled (#1372)

* feat/new-sweet-alert (#1377)

* add a delete prompt wrapper function and fix sweetalert

* fix css issue

* fix: remove user geolocation auto detection (#1388)

* chore: Bump version to 3.3.0

* refactor: refactored function dokan_get_client_ip(), this was causing problem while creating withdraw because of ip address filed size

* fix: Added missing param on woocommerce_admin_order_item_headers (#1414)

* add: black friday promotion 2021 (#1411)

* add: black friday promotion 2021

* update: date

* DateRangePicker library added (#1409)

* Fix(Product): add call to filter dokan_product_cat_dropdown_args to listing-filter.php (#1408)

* feat(Product): add new filter to hide categories

New filter to allow third parties to hide product categories from Dokan dashboard

Fixes: #1398

* Removing unneeded filter. Adding call to filter  in listing-filter.php

* fix: WC mail template overwrite issue fixed (#1403)

* Fix[Product]: allow filter to prevent adding cart-item tag (#1401)

* Bug[Product]: allow filter to prevent adding cart-item tag

Allow filter dokan_get_vendor_by_product preventing the addition of the "Vendor" cart-item tag if it doesn't return a valid vendor

Fixes: #1400

* Moving fix from functions.php to wc-template.php

* Render vendor email setting option conditionally (#1393)

* Render vendor email setting option conditionally

* fix: minor fix

* Fix/vendor store per page placeholder (#1396)

* Fix/vendor store per page placeholder

* fix/minor change

* fix/ minor change

* fix/change placeholder text

* Fix/update refund and withdraw database table column (#1391)

* fix/update withdraw and refund table

* fix/update refund and withdraw database table column

* fix/refund withdraw table column

* fix/update minor issue

* fix: necessary changes are made

* fix: phpcs updated

* fix/Update code

* Removed user switch setting from Dokan selling setting (#1394)

* Removed user switch setting from dokan selling setting

* Remove user switch admin notice

* Changed method return type and retun false if plugin not exist

* update: store dokan installed time for existing users
update: updated package.json files

* new: asking for review notice on admin dashboard pages (#1381)

* new: added plugin installation time for first time installation

* new: added ReviewNotice admin class

* new: added ask for review notice markup with styles on admin dashboard

* new: add postpond and dismiss interaciton with ajax to the ask for review admin dashboard notice

* style: update style of asking for review admin notice

* new: ask for review notice on wp admin dashboard

* new: update destination link to the ask for review admin dashboard notice

* new: update text-domain to the implementation of ask for review notice on admin dashboard pages

* new: fix phpcs errors in integration of ask for review notice on admin dashboard pages

* Added less CSS file for admin dashboard notice

* Removed wrongly placed CSS file for admin dashboard notice

* refactor: ask for review admin dashboard notice

* Corrected typo in localization function

* Fixed logo image path of ask for review admin dashboard notice

* Removed plugin links from the ask for review admin dashboard notice texts

* refactor: ask for review admin notice

* reformed and cleaned up ask for review admin notice

* removed postponed time in case of dismiss ask for review admin notice

* fixed some formation and typo in ask for review admin notice

* chore: Bump version to 3.3.1

* Refactor all scripts & organize all scripts

* Refactor order scripts

* Implement .env for easy configuration

* Delete unwanted file

* Update gitignore file

* Refactor seller support ticket scenario

* Manage multiple scenario in MultipleScenario Folder

* Refactor auction product existing codebase

Co-authored-by: Shanjidah Afroz <[email protected]>
Co-authored-by: Nurul Umbhiya <[email protected]>
Co-authored-by: Shazahanul Islam Shohag <[email protected]>
Co-authored-by: Zabir Ahmed Anik <[email protected]>
Co-authored-by: Nurul Umbhiya <[email protected]>
Co-authored-by: 79mplus Admin <[email protected]>
Co-authored-by: Alamgir Hossain <[email protected]>
Co-authored-by: Mário Valney <[email protected]>
Co-authored-by: Md. Sadikur Rahaman <[email protected]>
Co-authored-by: Md. Saiful Islam <[email protected]>
Co-authored-by: Maniruzzaman Akash <[email protected]>
Co-authored-by: Tanmay Kirtania <[email protected]>
Co-authored-by: Joseph Chambers <[email protected]>
Co-authored-by: Sapayth Hossain <[email protected]>
Co-authored-by: Aunshon <[email protected]>
Co-authored-by: Pierre <[email protected]>
Co-authored-by: Shahadat Hossain <[email protected]>
Co-authored-by: Abdul Hadi <[email protected]>
Co-authored-by: Rajan Karmaker <[email protected]>
Co-authored-by: Ratul Hasan <[email protected]>
Co-authored-by: Asad Nur <[email protected]>
Co-authored-by: Md. Asif Hossain Nadim <[email protected]>
Co-authored-by: unknown <[email protected]>
Co-authored-by: Tanjir Al Mamun <[email protected]>
Co-authored-by: David Marín <[email protected]>
Co-authored-by: FaraziF <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Dev Review Done 🎉 QA Approved This PR is approved by the QA team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants