Merge pull request #36 from wc1c/dev

Dev 0.23
wc1c · Apr 18, 2024 · 915c3db · 915c3db
2 parents 293d01b + 7e8ce53
commit 915c3db
Show file tree

Hide file tree

Showing 57 changed files with 3,572 additions and 1,830 deletions.
diff --git a/assets/css/main.min.css b/assets/css/main.min.css
diff --git a/assets/css/main.min.css.map b/assets/css/main.min.css.map
diff --git a/assets/js/bootstrap.bundle.min.js b/assets/js/bootstrap.bundle.min.js
diff --git a/assets/languages/wc1c-main-ru_RU.mo b/assets/languages/wc1c-main-ru_RU.mo
diff --git a/assets/languages/wc1c-main-ru_RU.po b/assets/languages/wc1c-main-ru_RU.po
diff --git a/assets/languages/wc1c-main.pot b/assets/languages/wc1c-main.pot
diff --git a/assets/scss/_configurations.scss b/assets/scss/_configurations.scss
@@ -4,4 +4,58 @@
   padding-left: 20px;
   background-color: white;
   border-left: 4px solid #fd0;
+}
+
+.configurations-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;
+  }
 }
diff --git a/assets/scss/_configurations_table.scss b/assets/scss/_configurations_table.scss
@@ -8,6 +8,8 @@
       {
         height: auto;
         padding: 0;
+        margin-bottom: .5rem !important;
+        margin-top: .5rem !important;
 
         .tablenav-pages
         {
@@ -39,6 +41,11 @@
       font-weight: 500;
     }
 
+    .row-actions
+    {
+      font-size: 14px;
+    }
+
     .column-name .configuration-metas
     {
       border: 1px solid #ccd0d4;
@@ -48,11 +55,16 @@
       margin-top: 10px;
     }
 
+    .row-metas-line-content
+    {
+      color: #000000!important;
+    }
+
     .column-configuration_id
     {
-      width: 75px;
+      width: 45px;
       border-right: 1px solid #ccd0d4;
-      max-width: 75px;
+      max-width: 45px;
 
       @include media-breakpoint-down(md)
       {
@@ -90,9 +102,8 @@
     {
       .colspanchange
       {
-        padding-top: 70px!important;
-        padding-bottom: 70px!important;
-        text-align: center;
+        padding: 10px!important;
+        text-align: left;
       }
     }
 

diff --git a/assets/scss/_nav.scss b/assets/scss/_nav.scss
@@ -35,12 +35,12 @@
     {
       .nav-link
       {
-        background: #dcdcde;
+        background: #fcf9e2;
         border: 0;
         padding: 0.5rem 0.7rem;
         margin-bottom: 0;
         color: #1d2327;
-        font-weight: 600;
+        font-weight: 500;
 
         &.active
         {

diff --git a/assets/scss/_other.scss b/assets/scss/_other.scss
@@ -88,4 +88,12 @@
   border-radius: 5px;
   margin-bottom: 5px;
   margin-top: 10px;
+}
+
+.wc1c-yellow-alert
+{
+  padding: 10px 10px 10px 20px;
+  background-color: white;
+  border: 2px solid #fd0;
+  border-left: 4px solid #fd0;
 }
diff --git a/assets/scss/external/_bootsrap.scss b/assets/scss/external/_bootsrap.scss
@@ -1,36 +1,36 @@
 /*
 *** Init
  */
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/functions";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/variables";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/variables-dark";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/maps";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/mixins";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/utilities";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/functions";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/variables";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/variables-dark";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/maps";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/mixins";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/utilities";
 
 @import "../variables";
 @import "../mixins";
 
 /*
 *** bootstrap
  */
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/root";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/buttons";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/transitions";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/badge";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/button-group";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/list-group";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/grid";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/card";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/tables";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/progress";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/forms";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/nav";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/alert";
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/popover";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/root";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/buttons";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/transitions";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/badge";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/button-group";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/list-group";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/grid";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/card";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/tables";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/progress";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/forms";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/nav";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/alert";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/popover";
 
 // Helpers
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/helpers";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/helpers";
 
 // Utilities
-@import "F:/Sources/bootstrap/bootstrap-5.3.0/scss/utilities/api";
+@import "F:/Sources/bootstrap/bootstrap-5.3.2/scss/utilities/api";
diff --git a/assets/scss/tocbot/_tocbot-core.scss b/assets/scss/tocbot/_tocbot-core.scss
@@ -60,7 +60,7 @@ a.toc-link {
 
     &.active
     {
-      background-color: #f0f0f1;
+      background-color: #fd0;
     }
 
     a
@@ -69,7 +69,7 @@ a.toc-link {
 
       &.is-active-link
       {
-        //color: #FFFFFF;
+        color: #000;
       }
     }
   }

diff --git a/composer.lock b/composer.lock
diff --git a/license.txt b/license.txt
@@ -1,6 +1,6 @@
 WC1C
 
-Copyright © 2018-2023 by WC1C team (http://wc1c.info)
+Copyright © 2018-2024 by WC1C team (http://wc1c.info)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/readme.txt b/readme.txt
@@ -2,17 +2,17 @@
 Contributors: WC1C, Frescoref
 Tags: commerceml, 1c, cml, ecommerce, wc1c, woocommerce, integration 1C, 1s, 1с, 1C, 1С
 Requires at least: 5.2
-Tested up to: 6.3
+Tested up to: 6.5
 Requires PHP: 7.0
-Stable tag: 0.22.0
+Stable tag: 0.23.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Donate link: https://wc1c.info/market
 
-Integration of WooCommerce with 1C products (different configurations)
+Integration of WooCommerce with 1C Company products (various configurations)
 
 == Description ==
-Implementation of a mechanism for flexible exchange of various data between 1C products and the WooCommerce plugin.
+Implementing a flexible mechanism for exchanging various data between 1C Company products and the WooCommerce plugin.
 
 = Features =
 * ✅ Automation of work with products (goods, services) 1C and WooCommerce.
@@ -71,8 +71,24 @@ Updates are released as needed, but only when available to the WC1C team. For mo
 == Changelog ==
 List of major changes from version to version. [Goto full list.](https://wc1c.info/changelogs)
 
+= 0.23.0 =
+* Improvement: language phrases
+* Improvement: interface design
+* Improvement: High Performance Order Storage (HPOS) compatibility
+* Improvement: remove log setting for receiver
+* WP tested up to: 6.4 & 6.5
+* WC tested up to: 8.1 & 8.2 & 8.3 & 8.4 & 8.5 & 8.6 & 8.7 & 8.8
+* Support PHP: 8.3
+* Up: Bootstrap to 5.3.2
+* Up: styles
+* Up: set default level for main events to 250
+* Up: ProductsCML to 0.15.0
+* Fix: 1C information column in new orders list by HPOS
+* Fix: configurations sort
+* Fix: more
+
 = 0.22.0 =
-* WP tested up to: 6.2
+* WP tested up to: 6.3
 * WC tested up to: 7.9 & 8.0
 * Up: ProductsCML to 0.14.0
 * Up: language files

diff --git a/src/Activation.php b/src/Activation.php
@@ -25,7 +25,7 @@ public function __construct()
 					'extra_data' => sprintf
 					(
 						'<p>%s <a href="%s">%s</a></p>',
-						__('The basic plugin setup has not been done yet, so you can proceed to the setup, which takes no more than 5 minutes.', 'wc1c-main'),
+						__('The basic plugin setup has not been done yet, so can proceed to the setup, which takes no more than 5 minutes.', 'wc1c-main'),
 						admin_url('admin.php?page=wc1c'),
 						__('Go to setting.', 'wc1c-main')
 					)