Merge pull request #23 from wsklad-source/dev

Dev 0.8.0

assets/languages/wsklad-ru_RU.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: WSKLAD\n"
-"POT-Creation-Date: 2024-01-17 13:27+0300\n"
-"PO-Revision-Date: 2024-01-17 13:28+0300\n"
+"POT-Creation-Date: 2024-03-31 14:41+0300\n"
+"PO-Revision-Date: 2024-03-31 14:42+0300\n"
 "Last-Translator: Frescoref\n"
 "Language-Team: \n"
 "Language: ru_RU\n"
@@ -73,8 +73,8 @@ msgstr "Расширения"
 msgid "Accounts"
 msgstr "Учетные записи"
 
-#: src/Admin.php:272 src/Admin/Accounts/AllTable.php:183
-#: views/accounts/dashboard.php:6 views/accounts/sections_single.php:6
+#: src/Admin.php:272 views/accounts/dashboard.php:6
+#: views/accounts/sections_single.php:6
 msgid "Dashboard"
 msgstr "Панель"
 
@@ -120,6 +120,14 @@ msgstr ""
 msgid "Awaiting final removal. All algorithms are disabled."
 msgstr "Ожидает окончательного удаления. Все алгоритмы отключены."
 
+#: src/Admin/Accounts/AllTable.php:169
+msgid "Status description"
+msgstr "Описание состояния"
+
+#: src/Admin/Accounts/AllTable.php:183
+msgid "Open dashboard"
+msgstr "Открыть панель"
+
 #: src/Admin/Accounts/AllTable.php:184
 msgid "Verification"
 msgstr "Проверить"
@@ -217,7 +225,7 @@ msgctxt "%s = human-readable time difference"
 msgid " (%s ago)."
 msgstr " (%s назад)."
 
-#: src/Admin/Accounts/Dashboard.php:225 views/extensions/item.php:20
+#: src/Admin/Accounts/Dashboard.php:225 views/extensions/item.php:18
 msgid "ID:"
 msgstr "ID:"
 
@@ -1656,25 +1664,25 @@ msgstr ""
 msgid "Error. Page for extensions not found."
 msgstr "Ошибка. Страница для расширений не найдена."
 
-#: views/extensions/item.php:6 views/extensions/item.php:14
-#: views/extensions/item.php:26 views/extensions/item.php:33
-#: views/extensions/item.php:37
+#: views/extensions/item.php:5 views/extensions/item.php:12
+#: views/extensions/item.php:24 views/extensions/item.php:31
+#: views/extensions/item.php:35
 msgid "none"
 msgstr "неизвестно"
 
-#: views/extensions/item.php:24
+#: views/extensions/item.php:22
 msgid "Version:"
 msgstr "Версия:"
 
-#: views/extensions/item.php:30
+#: views/extensions/item.php:28
 msgid "Versions WSKLAD:"
 msgstr "Версии WSKLAD:"
 
-#: views/extensions/item.php:31
+#: views/extensions/item.php:29
 msgid "from"
 msgstr "от"
 
-#: views/extensions/item.php:35
+#: views/extensions/item.php:33
 msgid "to"
 msgstr "до"
 
@@ -1962,9 +1970,9 @@ msgstr "Инструменты не найдены."
 msgid "As soon as the tools are installed, they will appear in this section."
 msgstr "Как только инструменты будут установлены, они появятся в этом разделе."
 
-#: views/tools/item.php:14
-msgid "Open"
-msgstr "Открыть"
+#: views/tools/item.php:12
+msgid "Open tool"
+msgstr "Открыть инструмент"
 
 #: views/wizards/error.php:3
 msgid "Error. Step not found or unavailable."

assets/languages/wsklad.pot

@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 "Project-Id-Version: WSKLAD\n"
-"POT-Creation-Date: 2024-01-17 13:27+0300\n"
+"POT-Creation-Date: 2024-03-31 14:41+0300\n"
 "PO-Revision-Date: 2022-12-11 01:58+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -68,8 +68,8 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: src/Admin.php:272 src/Admin/Accounts/AllTable.php:183
-#: views/accounts/dashboard.php:6 views/accounts/sections_single.php:6
+#: src/Admin.php:272 views/accounts/dashboard.php:6
+#: views/accounts/sections_single.php:6
 msgid "Dashboard"
 msgstr ""
 
@@ -113,6 +113,14 @@ msgstr ""
 msgid "Awaiting final removal. All algorithms are disabled."
 msgstr ""
 
+#: src/Admin/Accounts/AllTable.php:169
+msgid "Status description"
+msgstr ""
+
+#: src/Admin/Accounts/AllTable.php:183
+msgid "Open dashboard"
+msgstr ""
+
 #: src/Admin/Accounts/AllTable.php:184
 msgid "Verification"
 msgstr ""
@@ -208,7 +216,7 @@ msgctxt "%s = human-readable time difference"
 msgid " (%s ago)."
 msgstr ""
 
-#: src/Admin/Accounts/Dashboard.php:225 views/extensions/item.php:20
+#: src/Admin/Accounts/Dashboard.php:225 views/extensions/item.php:18
 msgid "ID:"
 msgstr ""
 
@@ -1548,25 +1556,25 @@ msgstr ""
 msgid "Error. Page for extensions not found."
 msgstr ""
 
-#: views/extensions/item.php:6 views/extensions/item.php:14
-#: views/extensions/item.php:26 views/extensions/item.php:33
-#: views/extensions/item.php:37
+#: views/extensions/item.php:5 views/extensions/item.php:12
+#: views/extensions/item.php:24 views/extensions/item.php:31
+#: views/extensions/item.php:35
 msgid "none"
 msgstr ""
 
-#: views/extensions/item.php:24
+#: views/extensions/item.php:22
 msgid "Version:"
 msgstr ""
 
-#: views/extensions/item.php:30
+#: views/extensions/item.php:28
 msgid "Versions WSKLAD:"
 msgstr ""
 
-#: views/extensions/item.php:31
+#: views/extensions/item.php:29
 msgid "from"
 msgstr ""
 
-#: views/extensions/item.php:35
+#: views/extensions/item.php:33
 msgid "to"
 msgstr ""
 
@@ -1801,8 +1809,8 @@ msgstr ""
 msgid "As soon as the tools are installed, they will appear in this section."
 msgstr ""
 
-#: views/tools/item.php:14
-msgid "Open"
+#: views/tools/item.php:12
+msgid "Open tool"
 msgstr ""
 
 #: views/wizards/error.php:3

assets/scss/_accounts.scss

@@ -50,6 +50,11 @@ table.accounts
     font-weight: 500;
   }
 
+  .row-actions
+  {
+    font-size: 14px;
+  }
+
   .column-connection_type .account-metas
   {
     border: 1px solid #ccd0d4;
@@ -59,11 +64,16 @@ table.accounts
     margin-top: 10px;
   }
 
+  .row-metas-line-content
+  {
+    color: #000000!important;
+  }
+
   .column-account_id
   {
-    width: 75px;
+    width: 45px;
     border-right: 1px solid #ccd0d4;
-    max-width: 75px;
+    max-width: 45px;
 
     @include media-breakpoint-down(md)
     {
@@ -163,4 +173,58 @@ table.accounts
       }
     }
   }
+}
+
+.accounts-status-popover
+{
+  --bs-popover-max-width: 277px;
+  --bs-popover-border-color: #fd0;
+  --bs-popover-border-width: 4px;
+  border-radius: 2px!important;
+
+  padding: 0!important;
+  border-right-width: 2px!important;
+  border-bottom-width: 2px!important;
+  border-top-width: 2px!important;
+
+  .popover-header
+  {
+    margin: 0!important;
+    border-bottom-width: 2px!important;
+  }
+
+  &.draft
+  {
+    --bs-popover-border-color: rgba(128, 0, 128, 0.9);
+  }
+
+  &.deleted
+  {
+    --bs-popover-border-color: rgba(128, 0, 128, 0.4);
+  }
+
+  &.active
+  {
+    --bs-popover-border-color: rgba(18, 128, 3, 0.6);
+  }
+
+  &.processing
+  {
+    --bs-popover-border-color: #128003;
+  }
+
+  &.inactive
+  {
+    --bs-popover-border-color: rgba(196, 22, 28, 0.6);
+  }
+
+  &.error
+  {
+    --bs-popover-border-color: #b8151a;
+  }
+
+  .popover-header, .popover-body
+  {
+    background-color: #fcf9e2;
+  }
 }

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "wsklad/wsklad",
-  "description": "Integration of WordPress and MoySklad",
+  "description": "Implementation of a mechanism for flexible exchange of various data between Moy Sklad and a site running WordPress.",
   "type": "project",
   "minimum-stability": "stable",
   "license": "GPL-3.0-or-later",

license.txt

@@ -1,4 +1,4 @@
-WSKLAD > integration of WordPress and Moy Sklad
+WSKLAD
 
 Copyright © 2019-2024 by WSKLAD team (http://wsklad.ru)
 

readme.txt

@@ -2,9 +2,9 @@
 Contributors: WSKLAD, Frescoref
 Tags: мой склад, moy sklad, woocommerce, woo, warehouse, wsklad
 Requires at least: 5.2
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.0
-Stable tag: 0.7.0
+Stable tag: 0.8.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Donate link: https://wsklad.ru/market
@@ -54,6 +54,11 @@ Updates are released as needed, but only when available to the WSKLAD team. For
 
 == Changelog ==
 
+= 0.8.0 =
+* Up: language files.
+* WP tested up to: 6.5
+* Fix: more.
+
 = 0.7.0 =
 * Fix: replace online.moysklad.ru to api.moysklad.ru
 * WP tested up to: 6.4

src/Admin/Accounts/AllTable.php

@@ -166,7 +166,7 @@ public function columnStatus($item): string
 			$status_description = __('Awaiting final removal. All algorithms are disabled.', 'wsklad');
 		}
 
-		return '<span class="' . $status_class . '" data-bs-toggle="popover" data-bs-trigger="hover focus click" data-bs-content="' . $status_description . '">' . $status . '</span>';
+		return '<span class="' . $status_class . '" data-bs-custom-class="accounts-status-popover ' . $status_class . '" data-bs-title="' . __('Status description', 'wsklad') . '"  data-bs-toggle="popover" data-bs-trigger="hover focus click" data-bs-content="' . $status_description . '">' . $status . '</span>';
 	}
 
 	/**
@@ -180,7 +180,7 @@ public function column_connection_type($item): string
 	{
 		$actions =
 		[
-			'dashboard' => '<a href="' . $this->utilityAdminAccountsGetUrl('dashboard', $item['account_id']) . '">' . __('Dashboard', 'wsklad') . '</a>',
+			'dashboard' => '<a href="' . $this->utilityAdminAccountsGetUrl('dashboard', $item['account_id']) . '">' . __('Open dashboard', 'wsklad') . '</a>',
 			'verification' => '<a href="' . $this->utilityAdminAccountsGetUrl('verification', $item['account_id']) . '">' . __('Verification', 'wsklad') . '</a>',
 			'delete' => '<a href="' . $this->utilityAdminAccountsGetUrl('delete', $item['account_id']) . '">' . __('Mark as deleted', 'wsklad') . '</a>',
 		];

views/accounts/update_form.php

@@ -7,13 +7,13 @@
         <div class="pe-0 pe-lg-2">
             <form method="post" action="<?php echo esc_url(add_query_arg('form', $args['object']->getId())); ?>">
                 <?php wp_nonce_field('wsklad-admin-accounts-update-save', '_wsklad-admin-nonce'); ?>
-                <div class="bg-white p-2 rounded-3 wsklad-toc-container section-border">
+                <div class="bg-white p-2 pt-0 rounded-3 wsklad-toc-container section-border">
                     <table class="form-table wsklad-admin-form-table">
                         <?php $args['object']->generateHtml($args['object']->getFields(), true); ?>
                     </table>
                 </div>
-                <p class="submit">
-                    <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save account', 'wsklad'); ?>">
+                <p class="submit mt-0">
+                    <input type="submit" name="submit" id="submit" class="button button-primary p-1 fs-6 px-3" value="<?php _e('Save account', 'wsklad'); ?>">
                 </p>
             </form>
         </div>

views/add/form.php

@@ -21,12 +21,12 @@
 			<?php do_action('wsklad_admin_add_sidebar_after_show'); ?>
 
             <div class="card border-0 mt-0 p-0 w-100">
-                <div class="card-body p-3">
+                <div class="card-body p-3 fs-6">
 					<?php _e('Enter a name for the new account and click the add account button.', 'wsklad'); ?>
                 </div>
                 <div class="card-footer p-3">
                     <p class="submit p-0 m-0">
-                        <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Add account', 'wsklad'); ?>">
+                        <input type="submit" name="submit" id="submit" class="button button-primary w-100 p-1 fs-6" value="<?php _e('Add account', 'wsklad'); ?>">
                     </p>
                 </div>
             </div>

views/connection/form.php

@@ -25,6 +25,6 @@
             }
         ?>
 
-	    <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e($button); ?>">
+	    <input type="submit" name="submit" id="submit" class="button button-primary p-1 fs-6 px-3" value="<?php esc_attr_e($button); ?>">
     </div>
 </form>

views/extensions/item.php

@@ -2,15 +2,13 @@
 
 <div class="extensions-all-item mb-2 mt-2 rounded-1 border border-3 bg-white">
     <div class="card-header bg-light p-2 border-0">
-        <h2 class="card-title mt-0 mb-0 float-start">
-            <?php printf('%s', wp_kses_post($args['object']->getMeta('name', __('none')))); ?>
-        </h2>
+        <h2 class="card-title mt-0 mb-0 float-start"><?php printf('%s', wp_kses_post($args['object']->getMeta('name', __('none')))); ?></h2>
         <div class="clearfix"></div>
     </div>
     <div class="card-body p-2">
         <div class="row g-0">
             <div class="col-24 col-md-15 col-lg-18">
-                <p class="card-text mt-2 mb-2">
+                <p class="card-text mt-2 mb-2 fs-6">
                     <?php printf('%s', wp_kses_post($args['object']->getMeta('description', __('none')))); ?>
                 </p>
             </div>