Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CASINT-10568 Disallow multiple shipping and pickup values in TSV #123

Merged
merged 1 commit into from
Feb 29, 2024
Merged

CASINT-10568 Disallow multiple shipping and pickup values in TSV #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ The most popular IDEs for development have an OpenAPI plugin, which helps with v
[Here](https://plugins.jetbrains.com/plugin/14837-openapi-swagger-editor) is one for IntellJ IDEA.
Alternatively, the web [Swagger editor](https://editor.swagger.io/) can help to surface any errors quickly, but is limited to a single file.

Please **make sure to resolve any linter errors and warnings** before committing changes to the main `gh-pages` branch.
Release follows standard procedure: add changes to new branch, create a PR and get required approvals, finally merge to `gh-pages`.

Please **make sure to resolve any linter errors and warnings** before merging changes to the main `gh-pages` branch.

(c) 2015 - The iCAS Team
11 changes: 1 addition & 10 deletions doc/0.129/_downloads/1312638521f7eca7e2eee84762c31f9c/feed-example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,10 @@
<admarkt:shippingType>PICKUP</admarkt:shippingType>
<admarkt:location>1097DN</admarkt:location>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>PICKUP</admarkt:shippingType>
<admarkt:location>1055AB</admarkt:location>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>SHIP</admarkt:shippingType>
<admarkt:cost>695</admarkt:cost>
<admarkt:time>2d-5d;</admarkt:time>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>SHIP</admarkt:shippingType>
<admarkt:cost>1195</admarkt:cost>
<admarkt:time>1d-2d</admarkt:time>
<admarkt:time>2d-5d</admarkt:time>
</admarkt:shippingOption>
</admarkt:shippingOptions>
<admarkt:attributes>
Expand Down
4 changes: 2 additions & 2 deletions doc/0.129/_downloads/93dbf90792498ee82059295c17c481bd/feed-example.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
vendor id title description status category id google product category product type url vanity url image link additional image link condition price type price original price unit pricing measure unit pricing base measure gtin brand mpn item group id phone number email advertiser seller name region id micro tip total budget daily budget cpc autobid pickup locations shipping attributes material color gender age group size energy efficiency class min energy efficiency class max energy efficiency class
42 Bally 1992 Adams Family Best pinball machine ever made ACTIVE 1624 Electronics > Arcade Equipment > Pinball Machines Hobby & Games > Arcade Games > Pinball Machines https://pinball.com/game/bally-adams-family/ https://pinball.com https://pinball.com/game/bally-adams-family/1.jpg https://pinball.com/game/bally-adams-family/2.jpg,https://pinball.com/game/bally-adams-family/3.jpg refurbished FIXED_PRICE 870000 875000 938452789055 Bally BC23456 16123456789 TRUE Pinball King 10000 1000 TRUE 1097DN 695:2d-5d;1195:1d-2d model:Adams Family,multiball:TRUE,screen size:32",resolutions:"1024x768:24dpi,800x600:18dpi" Wood/Metal/Glass black/white/green unisex adult E F D
vendor id title description status category id google product category product type url vanity url image link additional image link condition price type price original price unit pricing measure unit pricing base measure gtin brand mpn item group id phone number email advertiser seller name region id micro tip total budget daily budget cpc autobid pickup location shipping attributes material color gender age group size energy efficiency class min energy efficiency class max energy efficiency class
42 Bally 1992 Adams Family Best pinball machine ever made ACTIVE 1624 Electronics > Arcade Equipment > Pinball Machines Hobby & Games > Arcade Games > Pinball Machines https://pinball.com/game/bally-adams-family/ https://pinball.com https://pinball.com/game/bally-adams-family/1.jpg https://pinball.com/game/bally-adams-family/2.jpg,https://pinball.com/game/bally-adams-family/3.jpg refurbished FIXED_PRICE 870000 875000 938452789055 Bally BC23456 16123456789 TRUE Pinball King 10000 1000 TRUE 1097DN 695:2d-5d model:Adams Family,multiball:TRUE,screen size:32",resolutions:"1024x768:24dpi,800x600:18dpi" Wood/Metal/Glass black/white/green unisex adult E F D
469 changes: 234 additions & 235 deletions doc/0.129/_sources/feed-details.rst.txt
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 8 additions & 9 deletions doc/0.129/feed-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@
<td><p><a class="reference internal" href="#feed-ship"><span class="std std-ref">shipping &amp; pick-up</span></a></p></td>
<td><p>no</p></td>
</tr>
<tr class="row-odd"><td><p><a class="reference internal" href="#feed-ship"><span class="std std-ref">pickup locations</span></a></p></td>
<td><p>pickup locations</p></td>
<tr class="row-odd"><td><p><a class="reference internal" href="#feed-ship"><span class="std std-ref">pickup location</span></a></p></td>
<td><p>pickup location</p></td>
<td><p><a class="reference internal" href="#feed-ship"><span class="std std-ref">shipping &amp; pick-up</span></a></p></td>
<td><p>no</p></td>
</tr>
Expand Down Expand Up @@ -1326,32 +1326,30 @@
<summary>TSV</summary><p>Use <strong>shipping</strong> field to tell customers about the different cost vs. time options for your product delivery.
Each option should be formatted as follows:</p>
<p>[<em>cost in cents</em>]:[<em>minimum transit time in days</em>]-[<em>maximum transit time in days</em>]</p>
<p>You can provide multiple shipping options in a comma-separated list.</p>
<table class="docutils align-default">
<tbody>
<tr class="row-odd"><td><p>Example</p></td>
<td><div class="highlight-text notranslate"><div class="highlight"><pre><span></span>695:2d-5d;1195:1d-2d
<td><div class="highlight-text notranslate"><div class="highlight"><pre><span></span>695:2d-5d
</pre></div>
</div>
</td>
</tr>
</tbody>
</table>
<p>Use <strong>pickup locations</strong> field to tell customers <cite>location(s)</cite> your product can be picked up at.
Location is given as a postal code.
You can provide multiple locations in a comma-separated list.</p>
<p>Use <strong>pickup location</strong> field to tell customers <cite>location</cite> your product can be picked up at.
Location is given as a postal code.</p>
<table class="docutils align-default">
<tbody>
<tr class="row-odd"><td><p>Example</p></td>
<td><div class="highlight-text notranslate"><div class="highlight"><pre><span></span>1097DN,1055AB
<td><div class="highlight-text notranslate"><div class="highlight"><pre><span></span>1097DN
</pre></div>
</div>
</td>
</tr>
</tbody>
</table>
</details><details class="summary-xml">
<summary>XML</summary><p>You can provide multiple shipping/ pick-up options for each product.
<summary>XML</summary><p>You can provide shipping/ pick-up options for each ad.
Each option can be described with the following information:</p>
<table class="docutils align-default">
<thead>
Expand Down Expand Up @@ -1402,6 +1400,7 @@
<div class="line"><br /></div>
</div>
<p>Restrictions: Shipping options can be disabled/optional/mandatory for an ad.
Ads can contain maximum one shipping option per shipping option type (<em>SHIP</em>/<em>PICKUP</em>).’
It is configured per category, see <a class="reference internal" href="categories.html#category-config-v2"><span class="std std-ref">Category Configuration</span></a>.</p>
</section>
<section id="phone-number">
Expand Down
11 changes: 1 addition & 10 deletions doc/0.129/feeds.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,18 +298,9 @@ <h2>File Format<a class="headerlink" href="#file-format" title="Permalink to thi
<span class="w"> </span><span class="nt">&lt;admarkt:location&gt;</span>1097DN<span class="nt">&lt;/admarkt:location&gt;</span>
<span class="w"> </span><span class="nt">&lt;/admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingType&gt;</span>PICKUP<span class="nt">&lt;/admarkt:shippingType&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:location&gt;</span>1055AB<span class="nt">&lt;/admarkt:location&gt;</span>
<span class="w"> </span><span class="nt">&lt;/admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingType&gt;</span>SHIP<span class="nt">&lt;/admarkt:shippingType&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:cost&gt;</span>695<span class="nt">&lt;/admarkt:cost&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:time&gt;</span>2d-5d;<span class="nt">&lt;/admarkt:time&gt;</span>
<span class="w"> </span><span class="nt">&lt;/admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:shippingType&gt;</span>SHIP<span class="nt">&lt;/admarkt:shippingType&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:cost&gt;</span>1195<span class="nt">&lt;/admarkt:cost&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:time&gt;</span>1d-2d<span class="nt">&lt;/admarkt:time&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:time&gt;</span>2d-5d<span class="nt">&lt;/admarkt:time&gt;</span>
<span class="w"> </span><span class="nt">&lt;/admarkt:shippingOption&gt;</span>
<span class="w"> </span><span class="nt">&lt;/admarkt:shippingOptions&gt;</span>
<span class="w"> </span><span class="nt">&lt;admarkt:attributes&gt;</span>
Expand Down
2 changes: 1 addition & 1 deletion doc/0.129/searchindex.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 1 addition & 10 deletions doc/next/_downloads/1312638521f7eca7e2eee84762c31f9c/feed-example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,10 @@
<admarkt:shippingType>PICKUP</admarkt:shippingType>
<admarkt:location>1097DN</admarkt:location>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>PICKUP</admarkt:shippingType>
<admarkt:location>1055AB</admarkt:location>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>SHIP</admarkt:shippingType>
<admarkt:cost>695</admarkt:cost>
<admarkt:time>2d-5d;</admarkt:time>
</admarkt:shippingOption>
<admarkt:shippingOption>
<admarkt:shippingType>SHIP</admarkt:shippingType>
<admarkt:cost>1195</admarkt:cost>
<admarkt:time>1d-2d</admarkt:time>
<admarkt:time>2d-5d</admarkt:time>
</admarkt:shippingOption>
</admarkt:shippingOptions>
<admarkt:attributes>
Expand Down
4 changes: 2 additions & 2 deletions doc/next/_downloads/93dbf90792498ee82059295c17c481bd/feed-example.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
vendor id title description status category id google product category product type url vanity url image link additional image link condition price type price original price unit pricing measure unit pricing base measure gtin brand mpn item group id phone number email advertiser seller name region id micro tip total budget daily budget cpc autobid pickup locations shipping attributes material color gender age group size energy efficiency class min energy efficiency class max energy efficiency class
42 Bally 1992 Adams Family Best pinball machine ever made ACTIVE 1624 Electronics > Arcade Equipment > Pinball Machines Hobby & Games > Arcade Games > Pinball Machines https://pinball.com/game/bally-adams-family/ https://pinball.com https://pinball.com/game/bally-adams-family/1.jpg https://pinball.com/game/bally-adams-family/2.jpg,https://pinball.com/game/bally-adams-family/3.jpg refurbished FIXED_PRICE 870000 875000 938452789055 Bally BC23456 16123456789 TRUE Pinball King 10000 1000 TRUE 1097DN 695:2d-5d;1195:1d-2d model:Adams Family,multiball:TRUE,screen size:32",resolutions:"1024x768:24dpi,800x600:18dpi" Wood/Metal/Glass black/white/green unisex adult E F D
vendor id title description status category id google product category product type url vanity url image link additional image link condition price type price original price unit pricing measure unit pricing base measure gtin brand mpn item group id phone number email advertiser seller name region id micro tip total budget daily budget cpc autobid pickup location shipping attributes material color gender age group size energy efficiency class min energy efficiency class max energy efficiency class
42 Bally 1992 Adams Family Best pinball machine ever made ACTIVE 1624 Electronics > Arcade Equipment > Pinball Machines Hobby & Games > Arcade Games > Pinball Machines https://pinball.com/game/bally-adams-family/ https://pinball.com https://pinball.com/game/bally-adams-family/1.jpg https://pinball.com/game/bally-adams-family/2.jpg,https://pinball.com/game/bally-adams-family/3.jpg refurbished FIXED_PRICE 870000 875000 938452789055 Bally BC23456 16123456789 TRUE Pinball King 10000 1000 TRUE 1097DN 695:2d-5d model:Adams Family,multiball:TRUE,screen size:32",resolutions:"1024x768:24dpi,800x600:18dpi" Wood/Metal/Glass black/white/green unisex adult E F D