Changeset 2131236

Timestamp:

07/31/2019 08:00:01 AM (5 years ago)

Author:

sjregan

Message:

feat: 'instashop_gallery_product_source_lang' filter and 'product-source-lang' shortcode attribute

Location:

instashop/trunk

Files:

• includes/class-instashop-admin-api.php (modified) (1 diff)
• includes/class-instashop-settings.php (modified) (2 diffs)
• includes/class-instashop.php (modified) (8 diffs)
• instashop.php (modified) (3 diffs)
• package.json (modified) (1 diff)
• readme.txt (modified) (3 diffs)

instashop/trunk/includes/class-instashop-admin-api.php

@@ -3 +3 @@
 
 class InstaShop_Admin_API {
-    // const EMBED_URL = 'https://my.instashopapp.com/wordpress';
-    const EMBED_URL = 'http://instashopapp.test/wordpress';
-    
+    const EMBED_URL = 'https://my.instashopapp.com/wordpress';
+
     /**
      * Constructor function

instashop/trunk/includes/class-instashop-settings.php

@@ -104 +104 @@
                     'type'          => 'text',
                     'default'       => '',
+
                 ),
                 array(
@@ -129 +130 @@
                                         .'</div>'."\n"
                                         .'</section>',
+
                 ),
             )

instashop/trunk/includes/class-instashop.php

@@ -3 +3 @@
 
 class InstaShop {
-    const JS_GALLERY_URL = 'https://s3.amazonaws.com/instashop/js/embed-1.5.1.js';
-    const JS_GALLERY_VERSION = '1.5.1';
+    const JS_GALLERY_URL = 'https://s3.amazonaws.com/instashop/js/.1.js';
+    const JS_GALLERY_VERSION = '1..1';
 
     /**
@@ -182 +182 @@
      *      An array of attributes for the generated div placeholder. All are optional except must have either valid domain or gallery.
      * 
-     *      @type string $class         Additional CSS classes to add to div
-     *      @type string $source        Fully qualified URL (including trailing slash) indicating location of remote JS (for testing purposes only)
-     *      @type string $domain        Domain name associated with InstaShop account
-     *      @type string $gallery       Gallery ID associated with InstaShop account
-     *      @type string $layout        Gallery layout, must be supported by InstaShop license. One of: grid, layout, collage
-     *      @type string $theme         Theme to use for display of gallery and modal. One of: light, dark
-     *      @type bool   $prices        Display prices in modal
-     *      @type bool   $gallery-pins  Display pins in gallery
-     *      @type bool   $zoom          Use zoom effect on mouse-over within gallery
-     *      @type bool   $overlay       Display overlay effect on mouse-over within gallery
-     *      @type string $overlay-label Overlay label within gallery overlay effect
-     *      @type string $pin-type      Displayed pin type within gallery and modal. None hides pins in modal. One of: circle, radar, star, none.
+     *      @type string $class               Additional CSS classes to add to div
+     *      @type string $source              Fully qualified URL (including trailing slash) indicating location of remote JS (for testing purposes only)
+     *      @type string $domain              Domain name associated with InstaShop account
+     *      @type string $gallery             Gallery ID associated with InstaShop account
+     *      @type string $layout              Gallery layout, must be supported by InstaShop license. One of: grid, layout, collage
+     *      @type string $theme               Theme to use for display of gallery and modal. One of: light, dark
+     *      @type bool   $prices              Display prices in modal
+     *      @type bool   $gallery-pins        Display pins in gallery
+     *      @type bool   $zoom                Use zoom effect on mouse-over within gallery
+     *      @type bool   $overlay             Display overlay effect on mouse-over within gallery
+     *      @type string $overlay-label       Overlay label within gallery overlay effect
+     *      @type string $pin-type            Displayed pin type within gallery and modal. None hides pins in modal. One of: circle, radar, star, none.
+     *      @type string $product-source-lang Use product id from specified source language if WPML is enabled.
      * }
      * @access  public
@@ -200 +201 @@
      */
     public function gallery_shortcode ( $attr ) {
+
+
         $domain = wp_parse_url( get_home_url(), PHP_URL_HOST);
 
-        $attr = shortcode_atts( array(
-            'class' => false,
-            'source' => false,
-            'domain' => $domain,
-            'gallery' => 'default',
-            'layout' => false,
-            'theme' => false,
-            'prices' => false,
-            'gallery-pins' => false,
-            'zoom' => false,
-            'overlay' => false,
-            'overlay-label' => false,
-            'pin-type' => false,
-        ), $attr, 'instashop' );
-    
-        if ( $attr['domain'] == 'false' ) {
+        $attr = shortcode_atts( array(
+            'class'               => false,
+            'source'              => false,
+            'domain'              => $domain,
+            'gallery'             => 'default',
+            'layout'              => false,
+            'theme'               => false,
+            'prices'              => false,
+            'gallery-pins'        => false,
+            'zoom'                => false,
+            'overlay'             => false,
+            'overlay-label'       => false,
+            'pin-type'            => false,
+            'product-source-lang' => null,
+        ), $attr, 'instashop' );
+
+        if ( $attr['domain'] == 'false' ) {
             $attr['domain'] = false;
         }
@@ -234 +238 @@
         if ( $attr['pin-type'] !== false ) $data['pin-type'] = $attr['pin-type'];
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         $source = apply_filters( 'instashop_gallery_source', '' );
         
@@ -284 +306 @@
                 'product-id' => $product_id,
             );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             $source = apply_filters( 'instashop_gallery_source', '' );
@@ -299 +338 @@
             wp_register_script( $this->_token . '-gallery', self::get_js_gallery_url(), self::get_js_gallery_version() );
             wp_enqueue_script( $this->_token . '-gallery' );
-    
+    
             $output = str_replace( '{data}', $data_string, $template );
-            echo apply_filters( 'instashop_product_gallery', $output, $attr );
+            echo apply_filters( 'instashop_product_gallery', $output, $ );
         }
     }
@@ -409 +448 @@
      * Log the plugin version number.
      * 
-     * @access  public
+     * @access  p
      * @since   1.0.0
      */
@@ -415 +454 @@
         update_option( $this->_token . '_version', $this->_version );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

instashop/trunk/instashop.php

@@ -2 +2 @@
 /*
  * Plugin Name: InstaShop
- * Version: 1.1
+ * Version: 1.
  * Plugin URI: https://instashopapp.com/wordpress/
  * Description: Easily embed and manage your InstaShop galleries.
@@ -8 +8 @@
  * Author URI: https://wearezipline.com/
  * Requires at least: 4.0
- * Tested up to: 4.8.3
+ * Tested up to: 
  *
  * Text Domain: instashop
@@ -35 +35 @@
  */
 function InstaShop () {
-    $instance = InstaShop::instance( __FILE__, '1.1' );
+    $instance = InstaShop::instance( __FILE__, '1.' );
 
     if ( is_null( $instance->settings ) ) {

instashop/trunk/package.json

@@ -2 +2 @@
     "name": "instashop",
     "title": "InstaShop",
-    "version": "1.0.0",
+    "version": "1..0",
     "homepage": "https://instashopapp.com/",
     "main": "Gruntfile.js",

instashop/trunk/readme.txt

@@ -3 +3 @@
 Tags: instashop, instagram, gallery, shopping, woocommerce, social media, embed instagram, hashtag, product gallery
 Requires at least: 4.0
-Tested up to: 4.8.3
+Tested up to: 
 Requires PHP: 5.2.4
 Stable tag: trunk
@@ -92 +92 @@
 == Changelog ==
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 = 1.1 =
 * 2017-11-14
@@ -111 +132 @@
 == Upgrade Notice ==
 
+
+
+
+
+
+
+
+
 = 1.1 =
 * 2017-11-14